Random commit
Merge branch 'master' of github.com:kingsidharth/anamorphic_s

Conflicts:
	archive.php
	content-single.php