Figured out EGit, so I'll commit now.
Merge branch 'master' of https://github.com/kiorpesc/cs1699-deliverable2