bug fixes:
not sure what i'm doing
Merge branch 'master' of https://github.com/amni/Springies

Conflicts:
	src/data/example.xsp
	src/util/Vector.java