adding smithsonian_id and mineral_id, adjustment to layout
fixed merge error
fixed migration and navbar routes, and controllers
Merge pull request #21 from slwaller/master

fixed migration, navbar routes, and controllers