Merge remote-tracking branch 'leandro/master' into HEAD

Conflicts:
	FinalProject_Team/FinalProject_Team/FinalProject_Team.csproj
	FinalProject_Team/FinalProject_Team/Maintenance.cs
Merge remote-tracking branch 'brady/master' into HEAD

Conflicts:
	FinalProject_Team/FinalProject_Team/AddJob.Designer.cs
	FinalProject_Team/FinalProject_Team/FinalProject_Team.csproj
Fixed al the things that I think were broken