Added haml
added basic org and policy models
Merge pull request #2 from adambray/master

Added basics orgs and policies models
added basic RESTful controller for questions
add user model
added basic model validations for orgs, policies and questions
Merge pull request #3 from adambray/master

added basic restful controller for questions
generated user, org, and canidate controller
update gemfile for singly
added basic restful controllers for orgs and policies
Merge pull request #4 from adambray/master

added basic restful controllers for orgs and policies
Merge branch 'master' of github.com:ashleygwilliams/policycompass

pull changes
add voter model to schema
renamed canidate to candidate
fixed one last spelling mistake
add voters controller
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
add feed and dashboard to voter controller
Merge pull request #5 from schneidy/master

generated initial controllers
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