Live updates working
Merge branch 'master' of github.com:bzarzuela/devcup