login screen
Merge remote-tracking branch 'origin/master'
Merge pull request #6 from CST316GroupO/master

 	login screen