initial
Merge branch 'master' of https://github.com/JosephWongDigiflare/libgdxtest

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/JosephWongDigiflare/libgdxtest

Conflicts:
	.gitignore