Room Changes

Changed the room to add a door on a castle like structure(MAY NOT
IMPLEMENT)
Merge remote-tracking branch 'origin/master' into Joshie
Room changes-Added bitmaps, chaged textures, setRoom works with added wall in middle
Room Changes

Changed the room to add a door on a castle like structure(MAY NOT
IMPLEMENT)
Room changes-Added bitmaps, chaged textures, setRoom works with added wall in middle
Revert "Room changes-Added bitmaps, chaged textures, setRoom works with added wall in middle"

This reverts commit a407f69024690ecf5fee0849049cd4f3f56c1108.
Revert "Room Changes"

This reverts commit 5b7af530332f2238b07bb3cbe462894dc5e84e55.
Merge branch 'master' of https://github.com/tylerfelker/SoftwareEngineeringProject
Merge remote-tracking branch 'origin/Joshie'

Conflicts:
	ACFramework Version 2.01/ACFramework/cGame3DSurvival.cs
	ACFramework Version 2.01/ACFramework/game3D.cs
Added the castle and door to the game3D survival
Both rooms integrated(Mine + Wes' code)