Adiciona navbar configurada e adiciona evento watch no gulp
Merge branch 'master' of https://github.com/AEHO/estou-bem

Conflicts:
	assets/index.html