asjasf
saogasg
Merge branch 'master' of https://github.com/xoSauce/EikonHackathon

Conflicts:
	app/static/index.html