daily update
Merge branch 'master' of github.com:ITboy/me

Conflicts:
	note.org