fjernet den andre mappa, håper det går greit :s
Merge branch 'master' of https://github.com/Oddsor/TDT4280e3

Conflicts:
	tdt4280.exercise3/src/jade.jar