merges
Merge branch 'master' of ssh://office.themechanism.com/volume1/homes/git/repositories/safeFare
Merge branch 'master' of ssh://office.themechanism.com/volume1/homes/git/repositories/safeFare
changes for production push
postgres kill tope
merge github and spock
css
Merge branch 'master' of ssh://office.themechanism.com/volume1/homes/git/repositories/safeFare
remove solr files from repo
remove solr files from repo
stuff
Merge branch 'master' of ssh://office.themechanism.com/volume1/homes/git/repositories/safeFare
update deploy.rb and database.yml for deploy
compile assets
show restaurant page styling
css
Merge branch 'master' of ssh://office.themechanism.com/volume1/homes/git/repositories/safeFare
final changes before secondary page review
Merge branch 'master' of ssh://office.themechanism.com/volume1/homes/git/repositories/safeFare
final changes for secondary review