fixed some bugs
Merge branch 'master' of https://github.com/wmw24/SASAsightsee.git

Conflicts:
	src/wmw24/sasasightsee/client/SASAsightsee.java