modified Gemfile.lock
Gemfile.lock has been modified
Tweaked text shadow
Merge branch 'develop' of https://github.com/ruzbehb/pingpong into develop
Merge branch 'layout' into develop
modified db/schema.rb
Added basic jCarousel configuration
tweaked the jcarousel
Merge branch 'layout' of https://github.com/ruzbehb/pingpong into develop
Other jcarousel tweaking
Merge branch 'develop' into layout
playing with scoring app
Merge branch 'develop' into scorer_feature

Conflicts:
	Gemfile.lock
	app/views/matches/edit.html.erb