for pull
Merge branch 'master' of https://github.com/davidstevens37/WoodenLadle

Conflicts:
	app/controllers/home.php
	app/templates/master.php
	bower.json
	css/styles.css
	js/main.js
Merge branch 'master' of https://github.com/davidstevens37/WoodenLadle