crap, last commit was from the wrong machine
Merge branch 'master' of https://github.com/egtaonline/GameAnalysis