unknown commit
manual merge
modify gulptasks nicer
refactoring around header images