Adds the Location class and tests it
Adds the RoomLocation class and tests it
Adds the RoomType class and tests it
Merge origin/master

Conflicts:
	zombieHunting/src/zombiehunting/ZombieHunting.java
Merge origin/master

Conflicts:
	zombieHunting/src/zombiehunting/ZombieHunting.java
added author information
added author information