Fixed gradle build file

Fixed the poor implementation of my previous gradle file and made sure
it now works as expected
Merge https://github.com/xinyichen/CS-2340-Project
Merge https://github.com/xinyichen/CS-2340-Project
Faye: person4's gradle file
Merge https://github.com/xinyichen/CS-2340-Project