[nothing]
Merge branch 'master' of github.com:RobertoDip/middleman-nko-frontend

Conflicts:
	source/views/home.html