bunch of edits from on the airplane
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	index.html
	js/main.js