Merge branch 'cleanUpRepository' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
combined the contents of the two gradle build files into one, and put it into the root directory. DELETE::removed pom.xml deleted the pom.xml file, since it was used for maven and we use gradle in our project