Merge pull request #2 from CST316GroupO/master

 	SQL server info
Merge pull request #3 from CST316GroupO/master

added er diagram for the database.
Merge pull request #14 from gmann1/master

jh