Modified main, can't get a room to display yet
Merge branch 'master' of https://github.com/spencerking/CSE20212-Final-Project

Conflicts:
	main.cpp