commit
Added phpunit to composer & updated phpstorm6 settings
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.
Controllers are configured in their own files.
Merge pull request #1 from TheDesignAffiliatesInc/master

Pull request for contoller seperations
Major commit.

Tag ,1 created.
unversioning
Doctrine ORM installed and configured via the ConfigService class.

Includes new images of components used on the homepage.
Merge pull request #1 from snipertomcat/master

Weekend pull request