bugfix
Merge branch 'master' of github.com:ubc/acj-versus