Oh god the conflicting edits
Merge branch 'master' of https://github.com/nsgomez/txtmagicka