modified:   2013-05-10-first-log.md
	new file:   "2013-05-117-androidUI\345\210\235\346\216\242.md"
	deleted:    .2013-05-10-first-log.md.swp
	deleted:    2013-05-10-first-log.gfm
	deleted:    2013-05-10-first-log.md~
Merge branch 'master' of github.com:rockiee281/rockiee281.github.io

Conflicts:
	_posts/core-samples/2013-05-10-first-log.md