#94: created the layout page
beginning work on user register
going to wait for HttpPost to be finished before continuing
Merge branch 'master' into login
Merge branch 'master' into login
Merge branch 'master' into login

Conflicts:
	TaskHistory.userprefs
Merge branch 'master' into login
Merge branch 'master' into login
Merge branch 'master' into login

Conflicts:
	TaskHistory.csproj
Merge branch 'master' into login
Merge branch 'master' into login
added in fk constraints from users table
Merge branch 'master' into login
backup
Backup
safer to load
Merge branch 'master' into login

Conflicts:
	Controllers/HomeController.cs
fixed a merge conflict
Merge branch 'master' into login
Merge branch 'master' into login

Conflicts:
	Database/TaskHistory.sql