upd
upd
Implemented store/restore
Some old changes
Added/updates
Added
Local changes
Merge branch 'master' of github.com:larsch/home

Conflicts:
	.emacs