some changes
Merge branch 'master' of https://github.com/kavehfa/Beyondaroom

Conflicts:
	wordpress/wp-content/themes/twentythirteen/home.php