fuck
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5

Conflicts:
	Assignment 5/Library/bin/Debug/Library.dll
	Assignment 5/Library/bin/Debug/Library.pdb
	Assignment 5/Library/obj/Debug/Library.dll
	Assignment 5/Library/obj/Debug/Library.pdb
	Assignment 5/WebStore/admin.aspx.cs
	Assignment 5/WebStore/bin/Library.dll
	Assignment 5/WebStore/bin/Library.pdb
hi
dsklj;sdal;kjg
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5

Conflicts:
	Assignment 5/Library/Animals.cs
	Assignment 5/Library/bin/Debug/Library.dll
	Assignment 5/Library/bin/Debug/Library.pdb
	Assignment 5/Library/obj/Debug/Library.dll
	Assignment 5/Library/obj/Debug/Library.pdb
	Assignment 5/WebStore/bin/Library.dll
	Assignment 5/WebStore/bin/Library.pdb
Added User.cs
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5

Conflicts:
	Assignment 5/Library/Animals.cs
	Assignment 5/Library/bin/Debug/Library.dll
	Assignment 5/Library/bin/Debug/Library.pdb
	Assignment 5/Library/obj/Debug/Library.dll
	Assignment 5/Library/obj/Debug/Library.pdb
	Assignment 5/WebStore/Listing.xml
	Assignment 5/WebStore/bin/Library.dll
	Assignment 5/WebStore/bin/Library.pdb