Changed from cpp to cc
Merge branch 'master' of remote repository

Conflicts:
	src/PrimaryUI.cc
	src/Room.cc
	src/room-game.cc