hoe het was
Merge branch 'master' of https://github.com/jurnskie/Collegeradio-Website

Conflicts:
	collegeradio-leeuwarden/app/controllers/ShowPagescontroller.php
	collegeradio-leeuwarden/app/models/User.php
test