Merge branch 'master' of https://github.com/nyson/assignment3.git

Conflicts:
	src/DBTest.java

Signed-off-by: Magnus Duberg <gusdubma@student.gu.se>