commit so I can merge
Merge branch 'master' of github.com:mrfreester/sp1
erge branch 'master' of github.com:mrfreester/sp1

Conflicts:
	bouncer/circle.cc
half circle