Cameron's gradle
Merge branch 'master' of https://github.com/CS2340/M2