merge
merge
Merge branch 'master' of http://github.com/timlukens/ButtGame
Merge branch 'master' of http://github.com/timlukens/ButtGame
Fixed edge detection math