Merge branch 'master' into dashboard
Merge branch 'addchallenges' of https://github.com/boersmamarcel/challengesplatform into dashboard
Started out with working on the dashboard feature
First step features
new websteps
Fixje
Added Draper
merge
Adds supervisor feature file

Cucumber feature file for the supervisor tests
Minor fixes for supervisor feature

Fixed typo, renamed scenario and added another clause
Fixes for supervisor feature test

Changed wording in feature file to match the wording on web_steps.rb

Added story step to web_steps.rb for finding an input element on the
page
Fixed identation
Fixed typo
Merge branch 'dashboard' of https://github.com/boersmamarcel/challengesplatform into dashboard
merge with subscription
added steps for dates
Merge branch 'subscription' into dashboard
Finally merged