simen og silje
Merge branch 'master' of https://github.com/mollersilje/su4.git

Conflicts:
	su4/.classpath