Added haml
generated user, org, and canidate controller
renamed canidate to candidate
fixed one last spelling mistake
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Merge pull request #5 from schneidy/master

generated initial controllers