Working on implementing text... broken
Merge branch 'master' of https://github.com/marco61/IM-Main

Conflicts:
	src/com/team/innovation/Main_Game_Class.java