r bugfixes
xes
Merge branch 'master' of https://github.com/amni/Springies

Conflicts:
	src/view/Canvas.java