committing master
Updating Master Branch
test
new shit
Merge branch 'th' of https://github.com/DTGunts/DTG into th

Conflicts:
	DTGAME/.metadata/.log

DTGAME/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

DTGAME/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.ecli
pse.core.resources
	DTGAME/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	DTGAME/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	DTGAME/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	DTGAME/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	DTGAME/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	core/.classpath
	core/.settings/org.eclipse.jdt.core.prefs
	desktop/.settings/org.eclipse.jdt.core.prefs