merge from Laravel-4-Bootstrap-Starter-Site/master
Merge branch 'resource' of github.com:nekwebdev/Laravel-4-Bootstrap-Starter-Site into resource