Foo-ing in git
we have a license now
More hello world
Even more hellos
Added a greeting Java files

This is my extended description
Merge pull request #1 from chiabcdef/master

This code is awesome!
Merge pull request #2 from imavroukakis/master

Here's some fresh foo
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 https://github.com/jr0cket/ljc-git-workshop

merege