first commit
some stuff
basics work
stuff works sometimes
Merge branch 'ev'
Merge branch 'master' of github.com:jeremybmerrill/hifi