showpagescontroller
Merge branch 'master' of https://github.com/jurnskie/Collegeradio-Website

Conflicts:
	collegeradio-leeuwarden/app/views/showpages/index.blade.php