Dummy on line bouncing
Merge branch 'master' of https://github.com/ArjanBroos/SnCG1

Conflicts:
	TinkerToy.cpp