Delete test.txt
Merge branch 'Jamie-H'
Delete async-http-client-1.7.24.jar
Merge branch 'master' of https://github.com/BenAllenUK/GameJJB

Conflicts:
	Model Loader/jars/async-http-client-1.7.24.jar
Updated File Connector
UpdatedFile Connector
Remove meta
commit
Merge branch 'Ben-Allen's'
Deleted Meta
Merge branch 'master' into Jamie-H