merge
Merge branch 'master' of https://github.com/svenne87/betbattle
Merge branch 'master' of https://github.com/svenne87/betbattle
test