code in view
Merge branch 'master' of github.com:freakimkaefig/boris

Conflicts:
	src/js/MainController.js