Ignoring some files
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt