Created branch and made a few basic changes
Created branch and made a few basic changes
alot of work done on approval page but we still need to get reviewing the timesheet and submitting it.
Now showing the timesheet when a user row is selected.
WITH DAVIS. We got the functionality of approval working but we still need to integrate with the LDAP apis
Merge branch 'master' into approvePage

Conflicts:
	client/main.html
	client/main.js
Merge branch 'master' into approvePage
Merge pull request #14 from lanceriechel/approvePage

Merging approvePage with master.