Camera
Merge branch 'master' of github.com:watacoso/nofutureball

Conflicts:
	main/nofutureball/src/nofutureball/Camera.java
Renamed files and stuff