completed localstorage function
Merge branch 'localstore'

Conflicts:
	js/app.js