Resolvendo conflitos na mão msm
Arrumando .gitignore
Merge branch 'master' of https://github.com/LuizZak/Projeto-Semana-04

Conflicts:

GamePrototype.xcodeproj/project.xcworkspace/xcshareddata/GamePrototype.x
ccheckout
	GamePrototype/SystemAttackDrag.m
asdasd