Started working on testing front end with thomas
Fixed merge conflict
Merged master into front end
Added style to play page
Fixed merge conflict