did some work on balls
Merge branch 'master' of https://github.com/segmentedbit/impro-assignment

Conflicts:
	src/images.cc