...
Merge branch 'master' of https://github.com/sondreli/grouper-test

Conflicts:
	scripts/app.js
Merge branch 'master' of https://github.com/sondreli/grouper-test

Conflicts:
	views/dynamic.html
Integrated grouper service with the dynamic view