Setup angular base
Merge pull request #4 from JoshAntBrown/develop

Setup angular base
Merge branch 'develop' into develop-citizen-vote

Conflicts:
	routes/index.js
Done fixed
This and last commit was changing the routes and index and controllers for the feedback (now "polls") to angular