Commit beore merging
Merge branch 'master' of https://github.com/Epiphane/AnythingElse

Conflicts:
	TheGame-html/.gwt/.gwt-log
Updated gitignore
Merge branch 'master' of https://github.com/Epiphane/AnythingElse