More issues

another problem with git, trying to fix it
Merge branch 'master' of https://github.com/0xc355/shipsurvive

Conflicts:
	js/.idea/workspace.xml