Fixed a bug
Merge branch 'master' of github.com:KPWhiver/SpectroPolaris

Conflicts:
	SpectroPolarisServer/src/stkl/spectropolarisserver/Model.java