Our project became a hydra. Had to many heads.
Merge branch 'master' of https://github.com/kylebechtel/SWE

Conflicts:
	src/Main.java