Changed email to inter-actief email addresses
Merge branch 'master' of github.com:boersmamarcel/challengesplatform

Conflicts:
	config/deploy.rb