Update 7

derp
Merge remote-tracking branch 'origin/master'

Conflicts:
	Login.aspx.cs
Merge branch 'master' of https://github.com/Vend-Online/Vend-Online-Shop