Fixing workspace stuff
Deleting history and uneeded files
Merge branch 'Jamie-H'
Merge branch 'master' of https://github.com/BenAllenUK/GameJJB

Conflicts:
	Model Loader/jars/async-http-client-1.7.24.jar