note
Merge branch 'master' of boleo:boleo/boleo.github.io

Conflicts:
	_posts/2014-07-19-note.md