add new post02
Merge branch 'master' of https://github.com/garwon/garwon.github.io

Conflicts:
	2014/03/17/My-first-post/index.html
	new file:   .merge_file_b77mrk
	new file:   .merge_file_gcGfFk