added notes to intro
Merge branch 'master' of github.com:menslow/voltron
Merging master code into local