removed travis-pro attribute
Merge branch 'master' of https://github.com/boersmamarcel/challengesplatform
Update README.md
Updated Gem dependencies
Merge branch 'master' of https://github.com/boersmamarcel/challengesplatform
removed secret token from listing
added a dummy secret token to the github, makes sure capistrano removes this on production/staging servers
Added secret token for real now :)
Removed useless default values from user model
Merge pull request #114 from boersmamarcel/markdown

Removed useless default values from user model
Fixed more tests
Pre-merge commit
Merge branch 'master' into security
Removed nasty test variable dump
More tests fixed
Added admin user
(admin@utwente.nl, adminpass)