See Update
Merge branch 'master' of https://github.com/rococori/good-men-here

Conflicts:
	MP2/src/MP2/LogMain.java