fjernet bug
Merge branch 'master' of github.com:halv00rsen/Prosjekt-I

Signed-off-by: halv00rsen <jorgen-halvorsen@hotmail.com>

Conflicts:
	.classpath
Merge branch 'master' of github.com:halv00rsen/Prosjekt-I