commiting so i can run a pull
Merge branch 'master' of https://github.com/snipertomcat/Silex-Kitchen-Edition

Conflicts:
	.idea/workspace.xml
new commit
The contollers have been placed in seperate files.