aLotOfShizzle~JHBrandttt
Merge branch 'master' of https://github.com/utwente-di/di20

Conflicts:
	src/main/java/di20/rooster/Database.java