v1.0.1
Merge branch 'master' of https://github.com/famous-project/FAMOUS-Wordpress-theme

Conflicts:
	FAMOUS/footer.php
	FAMOUS/functions.php
	FAMOUS/header.php
	FAMOUS/page.php