lots of changes underway
fixed peach
finished added ui changes and npm stuff
Merge branch 'master' into gh-pages