Let's not repeat ourselves
No need for break, you're already returning
Merge branch 'slightly-better-controller'

Conflicts:
	classes/Controller.php