alzak page
paths update
update of paths
update
Merge branch 'master' into gh-pages

Conflicts:
	build/js/app.js
	index.html
	src/game.js

update master