Merge pull request #7 from spring-peepers-2014/contollers

Add controller template for campaigns, organizations and donors
Add show_all view path to controller
Merge pull request #12 from spring-peepers-2014/heroku-setup

Heroku setup
Merge branch 'development' of https://github.com/spring-peepers-2014/SmartSOS into development
Remove git log due to merge conflict. Needs to be added to git ignore
Merge branch 'master' into development
Add initial feature tests for user sign up/log in
Merge branch 'development' of https://github.com/spring-peepers-2014/SmartSOS into development
Merge branch 'development' into donor-feature-spec
Merge pull request #21 from spring-peepers-2014/donor-feature-spec

Add initial donor feature tests