Merge pull request #1 from jgmdv/develop

Initial merge from develop with initial design of web pages.
Merge pull request #2 from jgmdv/develop

Fixed some bugs. App ready for develop.
Merge branch 'master' of https://github.com/jgmdv/timekeeping-novare-ojt into develop
Merge branch 'develop' of https://github.com/jgmdv/timekeeping-novare-ojt into develop
Committed changes in tomcat
Added calendarView.html
Added CalendarView at Homepage
Merge pull request #6 from VenusArconada/develop

Added CalendarView in Homepage