Merge pull request #1 from Medious/master

merging commits
v1.1.1 - Adding ChatColors and Fixing coding conventions
Merge pull request #2 from OlympusPVP/master

Fixing Mize's coding conventions and adding ChatColors