fixed controllers, added migrations and joint tables
Merge pull request #6 from slwaller/master

fixed controllers, added migrations and joint tables
adding view files to minerals
Merge pull request #7 from slwaller/master

adding view files to minerals
Merge pull request #8 from belindahare/master

basic layout