Changed the format of the map idea

Used to be an no-type file, now a txt
New .gitignore
Edit to Map and Room
Added comments and toString, as well as a variable for tracking if the
player has visited the room or not
Created the Map class
Housekeeping
Merge branch 'Geoffs_WIP'
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project

Conflicts:
	Text Adventure/bin/Room.class
	Text Adventure/src/Room.java
Cleaned up the merge

I suck so hard at github
Merge branch 'master' into Geoffs_WIP