solved crash when start up
swap in a different file
Merge branch 'master' of https://github.com/dpinol/SDL_test

Conflicts:
	JewelObject.h