updated tests (not all passing)
resolved merge conflict
Added style to play page
Fixed merge conflict
Merge branch 'master' into front-end