Merge pull request #23 from boersmamarcel/develop

Split capistrano recipes for staging and production
Merge pull request #27 from boersmamarcel/develop

Adds FactoryGirl
Merge pull request #29 from boersmamarcel/develop

Colors and Fonts make the man.
Merge pull request #31 from boersmamarcel/develop

Fixes the FactoryGirl file inclusion issue
Merge pull request #36 from boersmamarcel/develop

Added bootstrap
Merge pull request #41 from boersmamarcel/develop

Working deployscript en fixed dependency
Reset to working version
Merge branch 'master' of github.com:boersmamarcel/challengesplatform
Removes file with not so secret keys anymore
Merge pull request #42 from boersmamarcel/develop

Awesome
Merge pull request #44 from boersmamarcel/develop

Updated Gem dependencies
Testcommit voor deployment
Merge pull request #46 from boersmamarcel/develop

Fixed ruby version string - Goed zo, Bas
Fixed the deploy script to work with devise's keys