more early staging.
Merge branch 'master' of https://github.com/milesefron/guitar