Second commit
Merge branch 'master' of https://github.com/manivp/hello

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