Search Pictures uploaded by username
Merge remote-tracking branch 'origin/nathanMasterCopy'

Conflicts:
	Controllers/HomeController.cs
	bin/csce361project1145.dll
	bin/csce361project1145.pdb
	csce361project1145.v12.suo
	obj/Debug/csce361project1145.dll
	obj/Debug/csce361project1145.pdb