Merge pull request #4 from jimrambow/master

I made some changes
changes
adding controllers and setting up database/routes
Merge pull request #5 from slwaller/master

adding controllers and setting up database/routes
readme
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/CorundumConundrum
fixed controllers, added migrations and joint tables
Merge pull request #6 from slwaller/master

fixed controllers, added migrations and joint tables
Merge remote-tracking branch 'upstream/master'
adding view files to minerals
Merge pull request #7 from slwaller/master

adding view files to minerals
Merge remote-tracking branch 'upstream/master'
header and background
Merge pull request #8 from belindahare/master

basic layout
Merge remote-tracking branch 'upstream/master'