Resolving merge conflicts
Resolving conflicts
hotfix: Nameplates crash #26
whitespace!
didn't mean to check in that vim file
Merge pull request #30 from vikinghug/master

whitespace
Merge pull request #31 from vikinghug/development

Development
Merge pull request #32 from vikinghug/master

Merge pull request #31 from vikinghug/development
Merge pull request #5 from vikinghug/development

Development