a subject 一个标题 a body 一个正文
Merge branch 'master' of
https://github.com/thelostthing/ZhiLianProject2014.git

Conflicts:
	ZhiLianProject2014/src/com/gem/zhilianproject2014/MainActivity.java