modified:   Social_Library/Social_Library-war/src/java/sociallibrary/addingbook/ISBNValidationServlet.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/AuthorDaoImpl.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/GenreDaoImpl.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/LibraryDaoImpl.java
Merge https://github.com/Ferioney/nc_social_library

Conflicts:
	Social_Library/Social_Library-war/src/java/sociallibrary/dao/LibraryDaoImpl.java

	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/LibraryDaoImpl.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/UsersDaoImpl.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dashboards/AddUsers.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dashboards/ChangeUsers.java
	new file:   Social_Library/Social_Library-war/src/java/sociallibrary/fortesting/Logout.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/library/GlobalLibraryServlet.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/registration/RegistrationServlet.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/validate/EmailValidator.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/validate/LoginValidator.java
	modified:   Social_Library/Social_Library-war/web/Registration.jsp
	modified:   Social_Library/Social_Library-war/web/WEB-INF/AddEditDeleteUsers.jsp
	modified:   Social_Library/Social_Library-war/web/WEB-INF/AddUsers.jsp
	modified:   Social_Library/Social_Library-war/web/WEB-INF/GlobalLibrary.jsp
	modified:   Social_Library/Social_Library-war/web/WEB-INF/objectValidate/Users.xml
	modified:   Social_Library/Social_Library-war/web/WEB-INF/template/template.jsp
	new file:   Social_Library/Social_Library-war/web/css/registration.css
	modified:   Social_Library/Social_Library-war/web/css/template.css
	new file:   Social_Library/Social_Library-war/web/images/background.jpg
	new file:   Social_Library/Social_Library-war/web/images/favicon.ico
	new file:   Social_Library/Social_Library-war/web/scripts/jquery.min.js
	new file:   Social_Library/Social_Library-war/web/scripts/validation.js