Changes to Hallway and Rooms Items implemented
Merge remote-tracking branch 'origin/master'

Conflicts:
	java/Weapon_LaserRifle.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 529f1fb1a6e1916f39ecd3b5266ef4062b65800b.
Revert "Changes to Hallway and Rooms Items implemented"

This reverts commit b44a0911e6f180255a214c5edf3f3368359b94ef.