Update site
Merge branch 'master' of github.com:davidhemphill/bumblecms.com

Conflicts:
	app/views/layouts/master.blade.php