adjustments for forms
Merge pull request #13 from jimrambow/master

Made changes to forms in Smithsonians
adjustments to controllers/routes
started minerals form
Merge pull request #14 from belindahare/master

started minerals form
added params to smithsonians
Merge pull request #15 from slwaller/master

poo
background done!
Merge pull request #16 from belindahare/master

background done!
forms for minerals
Merge pull request #17 from slwaller/master

forms for minerals
finished minerals form
Merge pull request #18 from belindahare/master

finished minerals form
routing erros fixed
Merge pull request #19 from belindahare/master

routing errors fixed
small bug, temporary change to home page link
Merge pull request #20 from belindahare/master

small bug, temporary change to home page link
adding smithsonian_id and mineral_id, adjustment to layout
fixed merge error
fixed migration and navbar routes, and controllers