modified:   main/nofutureball/src/nofutureball/EntityProps.java
Merge branch 'master' of http://github.com/watacoso/nofutureball
	new file:   main/nofutureball/src/nofutureball/Debugging.java
	deleted:    main/nofutureball/src/nofutureball/EntityProps.java
	new file:   main/nofutureball/src/nofutureball/JsonManager.java
	new file:   main/nofutureball/src/nofutureball/NaturalDeserializer.java
Merge branch 'master' of http://github.com/watacoso/nofutureball

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

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