we have a license now
More hello world
Even more hellos
Added a greeting Java files

This is my extended description
Conflict? What conflict?
All the world is green
Merge pull request #4 from anothem/master

Improved code efficiency by 42%
Merge pull request #6 from AJerm/master

Submitting a pull request
Merge branch 'master' of github.com:stealthness/ljc-git-workshop
An additional change from home