tidying up main.js
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	controller.pyc
	main.pyc
fixed conflicts