Adds Justin R.
Fixes merge conflict
Merge pull request #28 from mikemar10/master

Adds Justin R.