Merged with Uruainstein
Merge branch 'master' of https://github.com/Uruainstein/Universales-1 into Uruainstein-master

Conflicts:
	Universales/Bullet.cpp
	Universales/Bullet.h
	Universales/Character.h
	Universales/GameObject.h
	Universales/Permonkey.cpp
	Universales/Permonkey.h
	Universales/Room.h
	Universales/StageState.cpp
	Universales/StillAnimation.cpp
	Universales/StillAnimation.h
	Universales/Wall.cpp
	Universales/Wall.h
Teste
Merge branch 'Uruainstein-master'

Conflicts:
	Debug/Universales.exe
	Debug/Universales.ilk
	Debug/Universales.pdb
	Universales.sdf
	Universales/Character.h
	Universales/Character.h.orig
	Universales/GameObject.h
	Universales/GameObject.h.orig
	Universales/Permonkey.cpp
	Universales/Permonkey.cpp.orig
	Universales/Permonkey.h.orig
	Universales/Room.h
	Universales/Room.h.orig
	Universales/StageState.cpp
	Universales/StageState.cpp.orig
	Universales/StillAnimation.cpp
	Universales/StillAnimation.cpp.orig
	Universales/StillAnimation.h.orig
	Universales/Wall.cpp
	Universales/Wall.cpp.orig
	Universales/Wall.h.orig