re-factoring.
Merge branch 'master' of https://github.com/ivan5rovic/LiveBetting