fix
Merge branch 'master' of https://github.com/carlbanan/Creandum-theme

Conflicts:
	.DS_Store
	archive-network.php