Merge branch 'master' into java-oblig
beginning of oblig 3, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
First beta version, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
exception handlind and comments, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
screen position for the four small windows, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
more norwegian variable names, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Rent time for Person, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
final preperations for handin, oblig 3, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'java-oblig'