v
Merge branch 'master' of https://github.com/lostoy/notes

Conflicts:
	log.log