modified:   main/nofutureball/src/nofutureball/GameObject.java
	modified:   main/nofutureball/src/nofutureball/Room.java
Merge branch 'master' of http://github.com/watacoso/nofutureball

Conflicts:
	main/nofutureball/src/nofutureball/Room.java

	modified:   main/nofutureball/src/nofutureball/Camera.java
	modified:   main/nofutureball/src/nofutureball/GameObject.java
	modified:   main/nofutureball/src/nofutureball/Room.java
	new file:   main/nofutureball/src/nofutureball/Weapon.java