update login and search
Merge branch 'master' of https://github.com/tglasser15/InternshipApp

Conflicts:
	FinalProject/InternshipApp/InternshipApp.v11.suo
	FinalProject/InternshipApp/InternshipApp/obj/Debug/XapCacheFile.xml