Merge remote-tracking branch 'brady/master'

Conflicts:
	FinalProject_Team/FinalProject_Team/AddJob.Designer.cs
	FinalProject_Team/FinalProject_Team/AddJob.cs
	FinalProject_Team/FinalProject_Team/FinalProject_Team.csproj