Antes de dar pull.
Testando commit com merge

Merge branch 'master' of https://github.com/ggrunewald/mlp_towerdefense

Conflicts:
	classes/enemy.py
commit pré pull
Merge branch 'master' of https://github.com/ggrunewald/mlp_towerdefense

Conflicts:
	classes/enemy.py
dsa
Merge branch 'master' of https://github.com/ggrunewald/mlp_towerdefense

Conflicts:
	classes/enemy.pyc
Merge realizado com sucesso, eu acho.