Kind of working Ward resource
Merge branch 'master' of github.com:collinglass/moustacheMS

Conflicts:
	app/js/controllers.js
Merge branch 'master' of github.com:collinglass/moustacheMS

Conflicts:
	app/js/controllers.js