Merge
Merge branch 'master' of https://github.com/CharonChui/AndroidNote.git

Conflicts:
	day02Android������������.md