pushing it...
Merge branch 'master' of github.com:kbiton/ci-demo

Conflicts:
	src/main/java/com/example/App.java