Merge pull request #1 from CST316GroupO/master

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

Merge pull request #1 from CST316GroupO/master
Login UI test
Merge pull request #3 from brantunger/master

Login UI test
Merge remote-tracking branch 'upstream/master'
Created the help screen layout