startscreen test
Merge branch 'master' of https://github.com/Ducaluk/shapeGame

Conflicts:
	README.md
	js/.DS_Store