Added email to advisor
Merge remote-tracking branch 'origin/justin' into nicholas

Conflicts:
	CAPPamari.Test/bin/Debug/CAPPamari.Test.dll
	CAPPamari.Test/bin/Debug/CAPPamari.Test.pdb
	CAPPamari.Web/Controllers/UserController.cs
	CAPPamari.Web/Models/Model1.edmx.diagram
	CAPPamari.Web/Scripts/Main.js