first commit
:smile
Merge branch 'gh-pages' of github.com:malinkang/AndroidNote into gh-pages

Conflicts:
	.DS_Store