commit by Jon: circle detection working
Merge branch 'master' of ssh://github.com/eecs452/eecs452maav

this merge is nessisay (I swear)