updates
added resources
merging
Merge branch 'master' of github.com:simonpeters/laravelpresentation