Changed to Thin webserver for development (hides WARN Could not determine content-length of response body.)
Wrote specs for user and challenge
Fixed can_unenroll
Fixed menu padding
Merge pull request #188 from boersmamarcel/designfix

Fixed menu padding
Adds guidelines
Changes some text
Small footer on other pages
Merge pull request #185 from boersmamarcel/upcoverage

Improved coverage for user and challenge spec
Adds terms of services and privacy statement
First spell-check
Merge branch 'footer' of github.com:boersmamarcel/challengesplatform into footer
Merge branch 'master' into adduser

Conflicts:
	app/models/user.rb
Merge branch 'footer' into adduser