Merge pull request #1 from mindiatic/mindiatic

Mindiatic push 1
commit world
Mindiatic push 2
Merge origin/master into ilozano

Conflicts:
	src/main/java/com/mycompany/githubdemo/App.java
Merge origin/ilozano into mindiatic