Adds cucumber setup
Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
	config/database.yml
Changes the travis.yml file
Adds database.travis.yml
Merge branch 'develop' of github.com:boersmamarcel/challengesplatform into develop

Conflicts:
	Gemfile.lock
	config/database.yml
Merge branch 'master' of github.com:boersmamarcel/challengesplatform into develop

Conflicts:
	Gemfile.lock
	config/database.yml
Adds travis and cucumber support
Merge branch 'develop' of github.com:boersmamarcel/challengesplatform into develop
Merge pull request #6 from boersmamarcel/develop

Fixen