Merge Conflict Resolution
Merge branch 'master' of https://github.com/thecopy/Controll