update
update
Merge branch 'master' of github.com:chendong2012/configs

Conflicts:
	android/notes
add