new
Merge branch 'master' of https://github.com/digitalalien/digitalthemes

Conflicts:
	wp-content/themes/K.I.S.S.it/header.php