vendor compiled assets
Adding styles to the final match view
Merge branch 'develop'
Merge branch 'develop'
Added heroku compatibility gem
Deleted compiled assets
Renamed file
Added assets again
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Gemfile