test
Merge branch 'master' of https://github.com/lnkForKing/MyAndroid.git

Conflicts:
	res/values/strings.xml
使用SharedPreferences进行数据存储 +
activity跳转