commit
Merge branch 'master' of https://github.com/nahive/webgamedev

Conflicts:
	css/stylesheet.css
	index.html