Finish, almost.
Merge branch 'master' of https://github.com/YanyanZ/AlcoloBattle2