[greg] changed Calculator#getVacationBasedOnIntervals testing
[greg and jashaad] finished Calculator#getVacationBasedOnIntervals
[greg and jashaad] finished EmployeeService class
[greg and jashaad] finished new structure of project
commit jbehave files and workspace.xml
[g+j] fixed workspace.xml bug
[greg + jashaad] added beans to dispatcher servlet
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml