Creating a merge conflict.
Merge branch 'master' of github.com:aeells/git-showcase
Creating a merge conflict.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Greeting.java
	src/test/java/GreetingTest.java
Creating a merge conflict.