Errors
erors
Merge branch 'virinchi'

Conflicts:
	WebContent/menubar.xhtml
Merge branch 'master' of https://github.com/nehachoudhari/DigitalYearbook

Conflicts:
	WebContent/WEB-INF/.faces-config.xml.jsfdia
	WebContent/WEB-INF/faces-config.xml
	WebContent/WEB-INF/lib/DigitalYearbook-EJB-Session-Entity.jar
	WebContent/dispDepartment.xhtml
	WebContent/menubar.xhtml