A bunch

I'm too pissed off to give a good commit message
Still just trying to sync without errors
Merge branch 'master' of https://github.com/omriBernstein/qgame