updated the test for a static blog page
Merge branch 'master' of https://github.com/hallme/scaffolding
Cleaned up the functions file
Updated the default 404 message
Updated the header adding the html 5 shiv, cleaning up fav icons and basic structure
Updated the forms styles with boot strap button styles
updated the defualt "no image" image to something more genaric
Merge branch 'master' of https://github.com/hallme/scaffolding

Conflicts:
	functions.php
	scss/_forms.scss