Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated the gradle wrapper
Merge pull request #106 from matthewrice345/master

Update to the gradle wrapper