Merge branch 'develop' into match_and_score

Conflicts:
	db/schema.rb
Merge branch 'scorer_feature' of https://github.com/ruzbehb/pingpong into scorer_feature
Almost completed game models
Merge branch 'scorer_feature' of https://github.com/ruzbehb/pingpong into scorer_feature

Conflicts:
	db/schema.rb