commit world
Merge origin/master into ilozano

Conflicts:
	src/main/java/com/mycompany/githubdemo/App.java
Merge pull request #2 from mindiatic/ilozano

commit world