Completed Number 1 + Struggling on Number 2
Merge branch 'master' of https://github.com/chrischivers/JavaApps