Players choose between regular and special attacks (instead of moving and special attack)
Merge branch 'master' of https://github.com/milescj/cs194