测试
添加图片并修改相关类
添加提示功能
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/com/ly/test/ImageTest.java