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

Conflicts:
	source/index.html.erb
	source/layouts/layout.erb