Merge branch 'CIT_Mathgame-master'

Conflicts:
	README.md
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge branch 'master' of https://github.com/devinbost/jMathGame3d

Conflicts:
	README.md
	nbproject/build-impl.xml
	nbproject/project.xml