committing prior to pull again, still broken
Merge branch 'master' of https://github.com/wyattearp/iDectectProject.git
Merge branch 'master' of https://github.com/wyattearp/iDectectProject.git
it seems to kinda work!
Merge branch 'master' of
https://github.com/wyattearp/iDectectProject.git

Conflicts:
	src/edu/uc/cs/distsys/idetect/DetectMain.java