id additions
Merge branch 'master' into id

Conflicts:
	SOAP/SOAP/SOAP.csproj
	SOAP/SOAP/Views/Home/Profile.cshtml
form alterations
final for now
Merge branch 'master' of C:/project
Fixed navigation
Merge branch 'master' into form_alterations

Conflicts:
	SOAP/SOAP/SOAP.csproj
	SOAP/SOAP/Views/Home/Banner.cshtml
	SOAP/SOAP/Views/Home/Index.cshtml
Merge branch 'master' of C:/project
Moved hash to controller folder
Merge branch 'master' of C:/project
Removed merge conflict
Merge branch 'master' of file://C:/project
duh
Merge branch 'master' of C:/project

Conflicts:
	SOAP/SOAP/SOAP.csproj
Merge branch 'master' into form_alterations
Merge branch 'master' into form_alterations

Conflicts:
	SOAP/SOAP/SOAP.csproj
adding file
Removed shit
Fixed shit
submit removed