aaaaaa
aaa
Merge branch 'master' of https://github.com/Samitier/Snow-Bros-Reborn

Conflicts:
	Enemy.cpp
	Enemy.h
	EnemyOne.cpp
	cBicho.h
	cPlayer.cpp