Merge pull request #1 from CST316GroupO/master

made some important changes
Merge pull request #7 from austinpruitt/master

SQL server info
Merge pull request #8 from gmann1/master

Merge pull request #1 from CST316GroupO/master
added er diagram for the database.
Merge pull request #3 from CST316GroupO/master

Grabbing latest changes