Merge pull request #1 from crista/master

Gender-neutral comments :-)
Merge pull request #3 from crista/master

Fix bug that showed up with 3 players, whenone player collided with another.
working pipe and filter with pygame and console displays
Merge branch 'master' of github.com:gentimouton/swarch
Merge branch 'master' of https://github.com/gentimouton/swarch