saving work before reverting. last commit was a mistake.
Merge branch 'master' of https://github.com/regonics/beacon