border_width statt with in Kommentaren
Merge branch 'master' of github.com:yipyip/ThePythonGameBook
002fps simplified
mini fixes
mini fixes
mini fixes
mini fixes
mini fixes
libs
Merge branch 'master' of github.com:horstjens/ThePythonGameBook
merging
Merge remote branch 'upstream/master'
better 002 fps
Merge branch 'master' of github.com:yipyip/ThePythonGameBook
Merge remote-tracking branch 'origin'

Conflicts:
	pygame/002_display_fps.py
fix
Merge branch 'pretty' into y1

Conflicts:
	pygame/002_display_fps.py
	pygame/lib/__init__.pyc
	pygame/lib/screensaver.pyc
from future...
Merge pull request #5 from yipyip/master

2 und 3