Commit Segundo com Git-Cola
Commit com git-cola

https://github.com/rodrigootani/projeto_html
Commit
c
Merge branch 'master' of https://github.com/rodrigootani/projeto_html

Conflicts:
	homepage.html
cacete