Merge branch 'jm2/detect2' into jhaley
commitc6f16b43f1b0355b4833044cdc33d6a4476d72b6
authorjhaley <james.haley@ucdenver.edu>
Mon, 11 Apr 2016 18:59:41 +0000 (11 12:59 -0600)
committerjhaley <james.haley@ucdenver.edu>
Mon, 11 Apr 2016 18:59:41 +0000 (11 12:59 -0600)
treebe7efba3198ca70ffae78bee286dc3a484942e36
parent97ebd3f51bb17411d7f6a9d5e944c0fb29930a8e
parenteec7fc58a96226fba79fccf43cba433fb36afe3d
Merge branch 'jm2/detect2' into jhaley