Forgot to add some stuff
Merge branch 'master' of https://github.com/noobieteam/Fantasy-Mod

fixing errors... messed some stuff up