John Commit
Merge remote-tracking branch 'origin/MikeTestBranch' into JohnsTestBranch

Conflicts:
	JohnMikeTestCode/JohnMikeTestCode/Controllers/AccountController.cs
took out all comments in account controller