Merge branch 'jm2/detect2' into jhaley
commit70d3842071b49cad5e75d98c5a63b785c11164e8
authorjhaley <james.haley@ucdenver.edu>
Mon, 4 Apr 2016 17:31:58 +0000 (4 11:31 -0600)
committerjhaley <james.haley@ucdenver.edu>
Mon, 4 Apr 2016 17:31:58 +0000 (4 11:31 -0600)
tree747b30c48be02ddc7bc98a34bd93fd1ff34be794
parent028179b9b6e0138c62caac2f3eec78a62db63860
parent5e518620c751989624c0d6e26b4faf7366d0964e
Merge branch 'jm2/detect2' into jhaley