Merge pull request #2 from snipertomcat/master

Merging the 2 forks
commit to update laptop
Merge pull request #4 from TheDesignAffiliatesInc/master

pull
update workspace
Merge branch 'master' of https://github.com/snipertomcat/Silex-Kitchen-Edition
Merge pull request #3 from snipertomcat/master

pull my finger
Merge pull request #5 from TheDesignAffiliatesInc/master

Changes to the test directory
Merge branch 'master' of https://github.com/snipertomcat/Silex-Kitchen-Edition into master2