Login Works
Merge branch 'master' of https://github.com/apche93/CS4750

Conflicts:
	Database Notes.txt