updated stuff
Merge branch 'master' of github.com:weareytm/Ragnarok