Merge pull request #23 from boersmamarcel/develop

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

Adds FactoryGirl
Added custom google fonts
Colors
Fixes could not include file issue FactoryGirl
Merge pull request #29 from boersmamarcel/develop

Colors and Fonts make the man.
Merge branch 'develop' of github.com:boersmamarcel/challengesplatform into develop
Changes database.yml to database.travis.yml
Changes file inclusion in spec_helper.rb
Haml
Merge + haml
Merge pull request #31 from boersmamarcel/develop

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

Added bootstrap
Fixes could not include file issue FactoryGirl
Changes database.yml to database.travis.yml
Changes file inclusion in spec_helper.rb
Started writing login tests
Adds devise initial setup
Merges master