Signed-off-by: yyrookie <461396430@qq.com>
Merge branch 'master' of git@github.com:yyrookie/my-app.git

Conflicts:
	src/main/java/com/mycompany/app/App.java