add Candidate and CandidateAnswer models
Merge branch 'master' of https://github.com/schneidy/policycompass
Merge branch 'master' of https://github.com/schneidy/policycompass
Helper typo.
Merge branch 'master' of github.com:futuraprime/policycompass
add candidate controllers
Merge pull request #7 from adambray/master

added indices, foreign_keys, and updated questions controller
add validate for name and email to voter model
Merge branch 'master' of github.com:ashleygwilliams/policycompass
Merge branch 'master' of github.com:ashleygwilliams/policycompass into candidate_models

Conflicts:
	app/assets/stylesheets/candidate.css.scss
	app/controllers/candidate_controller.rb
	app/models/question.rb
	db/schema.rb
	test/functional/candidate_controller_test.rb
Merge branch 'master' of github.com:ashleygwilliams/policycompass into candidate_models

Conflicts:
	db/schema.rb
Merge pull request #6 from modality/candidate_models

Candidate Models
add voter answer model
moving files around
Lots of stubby views.
remove unnecessary views
cleanup
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass

Conflicts:
	app/views/voters/dashboard.html.erb
	app/views/voters/feed.html.erb
update voter answer to include id fields/indexes
Merge pull request #8 from futuraprime/master

Early static views