提交代码
解决地方睡懒觉
Merge branch 'master' of https://github.com/ainit/myapp/

Conflicts:
	src/com/aini/automic/TestAutoMic.java