updates to prototype
Merge branch 'master' of github.com:iaperez/Gusto