Fixed errors in main file
Merge branch 'master' of github.com:Jordicious/RPG