pulling dbsettings
Merge branch 'master' of https://github.com/miguel-natividad/HISPayrollSystem
lalalalla

Conflicts:
	PredatorUI2/Form1.cs
	PredatorUI2/bin/Debug/PredatorUI2.exe
	PredatorUI2/bin/Debug/PredatorUI2.pdb
	PredatorUI2/obj/x86/Debug/PredatorUI2.csproj.GenerateResource.Cache
	PredatorUI2/obj/x86/Debug/PredatorUI2.exe
	PredatorUI2/obj/x86/Debug/PredatorUI2.pdb
Updated as of 3/17/2014 906pm