.gitignore test
why is this not ignored?
test gitignore
more tests
test test test
test?
fuck it, im committing efferthing
added some stubs an shit
Wrong branch oops...

Committing all changes made from tonight
Merge branch 'dt' of https://github.com/DTGunts/DTG into dt

Conflicts:
	core/bin/com/dtg/game/DTGunts.class
	core/src/com/dtg/game/DTGunts.java
Asset manager

- added basic animated sprite loading classes
- shits still all a mess
gitignoring
adding more shit to gitignore
ignoring prefs
test ignoring .projects
removed w/e the fuck this was
Merge branch 'dt' of https://github.com/DTGunts/DTG into dt

most of this shit should have been ignored
i took your version of DTGunts

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	.settings/gradle/org.springsource.ide.eclipse.gradle.core.import.prefs
	DTGAME/.metadata/.log
	DTGAME/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	DTGAME/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	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.jdt.core/variablesAndContainers.dat
	DTGAME/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	DTGAME/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	DTGAME/.metadata/version.ini
	core/.classpath
	core/.settings/org.eclipse.jdt.core.prefs
	core/bin/com/dtg/game/DTGunts.class
	core/src/com/dtg/game/DTGunts.java
	desktop/.settings/org.eclipse.jdt.core.prefs
removing this shit again
fixed badly merged DTGunts.java :(
deleted compiled classes from repo