Updated the basics
Merge branch 'builder' of github.com:bdickason/strummer into builder