fixing little bug I wrote, oops
Merge branch 'master' of github.com:weareytm/Ragnarok