new beacon, triple beacon

beacons!
fixed merge conflicts
Merge branch 'master' of https://github.com/Chargeorge/Studio2