roll back
Merge branch 'master' of https://github.com/wippo/vGIf70LkAvVgIMsIh3Dm_theme

Conflicts:
	functions.php