la till en saknad ;
Merge branch 'master' of https://github.com/nyson/db-assignment1

Conflicts:
	weraFinal/Pgm3.java
Merge branch 'master' of https://github.com/nyson/db-assignment1