start
	Merge branch 'master' of https://github.com/Frylock13/ekspo

Conflicts:
	index.html
	js/app.js