final version
Merge branch 'origin/andrecandido'

Conflicts:
	public/index.html