Removed weird comment conflict things
Merge branch 'master' of ssh://github.com/PeterDrake/Drosophila
Merge branch 'master' of ssh://github.com/PeterDrake/Drosophila

Conflicts:
	src/edu/lclark/drosophila/Analyzer.java
Made comments
Merge branch 'master' of ssh://github.com/PeterDrake/Drosophila
Merge branch 'master' into commenting