temporary dev files for front end
Merge branch 'master' of https://github.com/xoSauce/EikonHackathon

Conflicts:
	app/frontEnd/public_html/index.html