readme test
fixed routes in forms and controllers for minerals
Merge pull request #24 from slwaller/master

fixed routes in forms and controllers for minerals
merge conflict fix
Merge branch 'belindahare-master'
merge conflict fix