Pulling from local storage
Merge branch 'master' of https://github.com/jnicolau/ChromeAppDiary

Conflicts:
	js/data.js
Fixed erros from merge