update hier...
asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Main.java
	src/viewer/ViewPositionData.java
Merge branch 'master' of ssh://git@github.com/xjtujack/Durham314.git