fixing a stupid bug causing templates to load even if they exist in local storage
Merge branch 'master' of github.com:obihann/Easy-Weather

Conflicts:
	.gitignore
	app/assets/tpl/app.haml