commit
Merge branch 'master' of https://github.com/yolandaw/CS410.git

Conflicts:
	CS410 Project/src/main/LogGatherer.java
	CS410 Project/src/main/Main.java