seeds again
Merge branch 'develop' of https://github.com/ruzbehb/pingpong into player_profile
Tweaked scoring app form
Further tweaks
Merge branch 'layout' into develop
minor UI changes
merged
Merge branch 'develop' into scorer_feature

Conflicts:
	db/seeds.rb