Rachel commit
Merge branch 'master' of https://github.com/tylerkern/pro260_team4

Conflicts:
	pro260_team4/Controllers/UserProfileController.cs
	pro260_team4/Views/Project/PartialProject.cshtml
	pro260_team4/Views/Shared/Layouts/_MainLayout.cshtml
	pro260_team4/Views/Shared/Partials/PartialTeam.cshtml
	pro260_team4/Views/UserProfile/Profile.cshtml