suma
Merge remote-tracking branch 'origin/master'

Conflicts:
	rayoultimo/SDLMiniRPG-master/SDL2Testground.layout