Quincy Larson 7279559c41 Merge branch 'staging' into nonprofit-improvements ... Conflicts: controllers/resources.js seed_data/bonfires.json views/partials/navbar.jade		2015-05-22 19:36:15 -07:00
..
show.jade	Merge branch 'staging' into nonprofit-improvements	2015-05-22 19:36:15 -07:00