Adds some stuff
Merge branch 'master' of github.com:carrollgt91/wave-app