Merge pull request #3 from CST316GroupO/master

Merging after help screen update
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 #10 from brantunger/master

Merge pull request #3 from CST316GroupO/master
Fixed the rendering error, changed theme for helpscreen
Merge pull request #13 from brandonespana/master

Fixed the rendering error, changed theme for helpscreen
Merge pull request #14 from gmann1/master

jh
login screen
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Getting Gabe's changes