Sync commit
sync commit
blerg
blerg2
Merge branch 'master' of https://github.com/Tutz/Projeto-Semana-3

Conflicts:
	.gitignore
knabvcdsf