Atualizando o site
Merge branch 'master' of https://github.com/GroupLighthouse/droplife

Conflicts:
	.gitignore