pulling for the 100th time
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5
new logon page
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5

Conflicts:
	Assignment 5/Library/User.cs
	Assignment 5/WebStore/Default.aspx.cs
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5