my commit befor raaz's pull
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch

Conflicts:
	build/classes/com/tss/ocean/controller/EmployeeController.class
	build/classes/com/tss/ocean/controller/financeMenuControllers.class
	src/com/tss/ocean/controller/EmployeeController.java
	src/com/tss/ocean/controller/financeMenuControllers.java
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch

Conflicts:
	build/classes/com/tss/ocean/controller/AlarmController.class
	build/classes/com/tss/ocean/controller/financeMenuControllers.class
	build/classes/com/tss/ocean/dao/EmployeesDAO.class
	build/classes/com/tss/ocean/dao/EmployeesDAO_1.class
	build/classes/com/tss/ocean/idao/IEmployeesDAO.class
	src/com/tss/ocean/controller/AlarmController.java
	src/com/tss/ocean/dao/EmployeesDAO.java
	src/com/tss/ocean/dao/EmployeesDAO_1.java
	src/com/tss/ocean/idao/IEmployeesDAO.java