Fixes could not include file issue FactoryGirl
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