add git ignore
Merge branch 'master' of https://github.com/chynchwen/notes

Conflicts:
	.gitignore