added some stuff
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	controller.pyc