new file:   main/nofutureball/assets/json/player.json
	new file:   main/nofutureball/assets/json/soundManager.json
	deleted:    main/nofutureball/out.txt
	new file:   main/nofutureball/src/nofutureball/JsonBuilder.java
	deleted:    main/nofutureball/src/nofutureball/JsonManager.java
	modified:   main/nofutureball/src/nofutureball/Player.java
	modified:   main/nofutureball/src/nofutureball/SoundManager.java
Merge branch 'master' of http://github.com/watacoso/nofutureball

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

	modified:   main/nofutureball/src/nofutureball/Camera.java
	modified:   main/nofutureball/src/nofutureball/Entity.java