commit
Merge branch 'master' of github.com:JavierJia/note
update
Merge branch 'master' of github.com:JavierJia/note

Conflicts:
	android.md