updated test class
Little change
Merge branch 'master' of https://github.com/xonefivd/S13GroupA

Conflicts:
	src/newTestClass.java
du er en
Merge branch 'master' of https://github.com/xonefivd/S13GroupA
New commit
Merge branch 'master' of https://github.com/xonefivd/S13GroupA
Argh this is some crap
Merge branch 'master' of https://github.com/xonefivd/S13GroupA

Conflicts:
	src/newTestClass.java
test
....
Merge branch 'master' of https://github.com/xonefivd/S13GroupA
Starting over
Merge branch 'master' of https://github.com/xonefivd/S13GroupA
Starting over 2
Added "Ansat" class
dummy commit
Merge branch 'master' of github.com:xonefivd/S13GroupA