mere data
Merge branch 'master' of https://github.com/jesper1610/gruppe13_del1.git

Conflicts:
	13_del1/src/Main/Data.java