aigasg
gsalijags
Merge branch 'master' of https://github.com/xoSauce/EikonHackathon

Conflicts:
	app/templates/index.html
Merge branch 'master' of https://github.com/xoSauce/EikonHackathon