added stuff
Merge branch 'master' of https://github.com/pysmo/aimbat into lolz
Merge pull request #48 from pysmo/lolz

Lolz