Creating data table
Added game updates following api response
Websockets working for data table update
Merge branch 'scorer_feature' of https://github.com/ruzbehb/pingpong into scorer_feature

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/match.js.coffee
Fixing some bugs on scoring app - fix orders within arrays
fixed error in edit view
Merge branch 'develop' into scorer_feature

Conflicts:
	Gemfile.lock
	app/views/matches/edit.html.erb
added table tennis tournament images
Removed pesky .DS_Store files
Playing around with paddles
An attempt to Sass things up a bit
Basic design for matches/new
Tweaked matches/new
Converting scoring app to %
Cleaning up the scoring app & fixed play button
A few little tweaks