s
Merge branch 'master' of ssh://git@github.com/Wick3r/WikiN-G-ER.git

Conflicts:
	Wikinger/src/data/DataDump.java