merge
Merge branch 'master' of https://github.com/fox-squirrels-2013/Legend-of-Moltar
merge and small big fixes
Merge pull request #34 from fox-squirrels-2013/bug_fix

Bug fix