jg
Merge branch 'master' of
https://github.com/tomvangreen/ch.digitalmeat.ld28.git

Conflicts:
	ld28-html/.gitignore
	ld28-html/war/WEB-INF/classes/ch/digitalmeat/ld28/client/GwtLauncher.class