Will bundle update help?
Added Erik to the team
Updates travis.yml
Adds devise key
Fixes Devise
generate_token is replaced by Devise.friendly_token
Some small irrelevant changes as well, you can safely ignore them...
Merge branch 'add_erik' of github.com:boersmamarcel/challengesplatform into add_erik
Removes double gem
Merge pull request #345 from boersmamarcel/add_erik

Add erik