add CandidateCategory class
non-null those ID columns
Merge branch 'master' of github.com:ashleygwilliams/policycompass
whoops, don't delete the Org model bro
Merge branch 'master' of github.com:ashleygwilliams/policycompass

Conflicts:
	app/models/org.rb
basic profile page and new candidate page
add Org forms
commenting out some question handling we're not using yet
Merge pull request #13 from adambray/master

basic views for policies (except for new and edit)
Merge branch 'master' of github.com:ashleygwilliams/policycompass

Conflicts:
	app/controllers/orgs_controller.rb
Merge pull request #12 from redyaffle/master

profile page and new user page without styling
added more views for policies