added TODO stuff on main class. Needs to review other main methods if we still need them.
Merge branch 'develop' of https://github.com/mrwinton/TheExcellentAdventure into develop

Conflicts:
	src/main/Main.java