hi
kl;jsdaf
Merge branch 'master' of https://github.com/TrifectaTech/KarzPlus

Conflicts:
	KarzPlus/Web.config
Merge branch 'master' of https://github.com/TrifectaTech/KarzPlus.git
test
Merge branch 'master' of https://github.com/TrifectaTech/KarzPlus

Conflicts:
	KarzPlus/KarzPlus.csproj
	KarzPlus/Login.aspx
	KarzPlus/Register.aspx
	KarzPlus/Register.aspx.cs
	KarzPlus/Site.Master
	KarzPlus/Web.config