Exception handling
Merge branch 'master' of github.com:DoCGameDev/rpg

Conflicts:
	.gitignore