added client side storage
added reset button
Merge branch 'master' into client-side-storage

Conflicts:
	app/index.html