No real changes made, just a little formatting.
Merge branch 'master' of https://github.com/weslgames/MERCury
Testing?