Cleaning up
Merge branch 'master' into lockhart

Conflicts:
	Text Adventure/bin/Room.class
git ignore update
Fixed a typo

q pqssing nebula
Merge branch 'master' into lockhart
Added printMessage method for printing to console
Merge branch 'master' into Geoffs_WIP