c
Merge branch 'master' of https://github.com/bsdshell/note

Conflicts:
	note.txt
add
add