Adding code to git
Converting to Junit tests.
Attempting my first git merge...