store controller
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	controllers/default.py.bak
	progress.log
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	controllers/default.py.bak
	progress.log
please work
Merge branch 'develop' of https://github.com/hookkshot/WebEngAssignment into develop