Need to do a merge because started the github repo with a license which causes pushes to fail unless merged
Need to do a merge because started the github repo with a license which causes pushes to fail unless merged

Merge branch 'master' of https://github.com/jeremymchacon/colony_counter

jeremymchacon/colony_counter,jeremymchacon/colony_counter