Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Some view cleanup/name changes.
Added a basic onboarding questions view.
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass

Conflicts:
	config/routes.rb
A few bits of the onboarding
Added feed to static_pages.
Merge pull request #10 from futuraprime/master

More static page views