localstorage and db
Merge branch 'master' of https://github.com/dosjos/Startup