grrr… forced commits of meaningless changes!
Merge branch 'master' of https://github.com/Sloth6/Beacon