Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch feature-client-side
Your branch is ahead of 'origin/feature-client-side' by 18 commits.
  (use "git push" to publish your local commits)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

modified:   src/main/webapp/WEB-INF/flows/main/surgeonHome.xhtml
modified:   src/main/webapp/WEB-INF/layouts/post-login-sans-tabs.xhtml
modified:   src/main/webapp/WEB-INF/layouts/post-login.xhtml
modified:   src/main/webapp/WEB-INF/login.xhtml
modified:   src/main/webapp/styles/mod.css
work in progress on cancel availabilities
adding name functionality
heavy revision to surgeon home page: new, more detailed table with clickable rows that open a modal
upgrading to primefaces 3.5. yeah.
optimizing homepage
Merge branch 'feature-cancelAvailability' into feature-client-side

Conflicts:
	src/main/webapp/WEB-INF/flows/main/surgeonHome.xhtml
adding functionality for the homepage
removing unnecessary html
Merge branch 'feature-client-side' of github.com:atyagi/SurgeryAssist into feature-client-side

Conflicts:
	src/main/webapp/WEB-INF/flows/main/surgeonHome.xhtml
Merge branch 'feature-client-side' into feature-cancelAvailability
wip