login changes
Merge branch 'master' of github.com:cwelch7/3307A-work-assignments
fixed merge conflict
Conflicts:
	Assign1.cpp