marge
Merge branch 'master' of github.com:floatec/gamejam

Conflicts:
	javascript/main.js