merge
merge fixed
Merge branch 'master' of https://github.com/pankshok/pygame-study

merge
Merge branch 'master' of https://github.com/pankshok/pygame-study

dunno
Merge branch 'master' of https://github.com/pankshok/pygame-study

lol
Merge branch 'master' of https://github.com/pankshok/pygame-study

merge
setup.py moved and slighty improved; tutor moved out from spacegame; some minor fixes