Styling updates following merge, testing
Merge branch 'demo' of https://github.com/ubc/acj-versus into demo