Merge pull request #2 from tyler569/master

Forms combined into prototype
Button log out created
Show -> ShowDialog + added Utility
Added List to AddUser and sample date - working for prototype 2.
I added the lst Maitenance and made up some data in order to allow the client understand how this form works.
included missing classes combo box item and cls maintenance
Made Add Job
Ryan changes
Merge branch 'ryanchanges'

Conflicts:
	FinalProject_Team/FinalProject_Team/FinalProject_Team.csproj
	FinalProject_Team/FinalProject_Team/UserAdd.Designer.cs
	FinalProject_Team/FinalProject_Team/UserAdd.cs
Merge remote-tracking branch 'leandro/master'

Conflicts:
	FinalProject_Team/FinalProject_Team/FinalProject_Team.csproj
	FinalProject_Team/FinalProject_Team/Maintenance.cs
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
Merge pull request #2 from tyler569/master

New additions dump