readme test
Merge pull request #21 from slwaller/master

fixed migration, navbar routes, and controllers
started on working with the photo uploader
Merge pull request #23 from slwaller/master

fixed smithsonian show page
Merge pull request #24 from slwaller/master

fixed routes in forms and controllers for minerals
small bug fixes
merge conflict fix
Merge branch 'belindahare-master'
merge conflict fix
Merge pull request #25 from belindahare/master

small bug fixes
Merge pull request #22 from jimrambow/master

started on working with the photo uploader
headache