added indcies and foreign keys for policies and candidates
updated schema to fix merge conflict
Merge remote-tracking branch 'upstream/master'
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:
	db/schema.rb