Merge pull request #1 from slwaller/master

initial commit
test
test
Merge pull request #2 from jimrambow/master

test
changes in readme file
Merge branch 'belindahare-master'
I made some changes.
I made some changes.
fixing readme file
Merge pull request #4 from jimrambow/master

I made some changes
Merge pull request #5 from slwaller/master

adding controllers and setting up database/routes
Merge pull request #6 from slwaller/master

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

adding view files to minerals