Quincy Larson 43f347bae0 Merge branch 'calculator' into staging ... Conflicts: app.js controllers/resources.js seed/field-guides.json		2015-06-14 01:10:48 -07:00
..
show.jade	Merge branch 'calculator' into staging	2015-06-14 01:10:48 -07:00