modification on viewer
gitinore
Merge branch 'master' of ssh://git@github.com/xjtujack/Durham314.git

Conflicts:
	src/inputGeneration/StaticInfo.java
	src/viewer/ViewPositionData.java