changes in gemfile.lock
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/CorundumConundrum
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
finishing forms for smithsonians
views to smithsonian
Merge pull request #13 from jimrambow/master

Made changes to forms in Smithsonians
Merge pull request #14 from belindahare/master

started minerals form