modified:   Social_Library/Social_Library-war/src/java/sociallibrary/addingbook/ISBNLoadingServlet.java
	new file:   Social_Library/Social_Library-war/src/java/sociallibrary/addingbook/ISBNValidationServlet.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/LibraryDaoImpl.java
	modified:   Social_Library/Social_Library-war/web/WEB-INF/AddBook.jsp
	modified:   Social_Library/Social_Library-war/web/WEB-INF/web.xml
Merge https://github.com/Ferioney/nc_social_library

Conflicts:
	Social_Library/Social_Library-war/web/WEB-INF/web.xml

	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dao/UsersDaoImpl.java
	new file:   Social_Library/Social_Library-war/src/java/sociallibrary/dashboards/AddUsers.java
	modified:   Social_Library/Social_Library-war/src/java/sociallibrary/dashboards/ChangeRoles.java
	new file:   Social_Library/Social_Library-war/src/java/sociallibrary/dashboards/ChangeUsers.java
	modified:   Social_Library/Social_Library-war/web/WEB-INF/AddEditDeleteUsers.jsp
	new file:   Social_Library/Social_Library-war/web/WEB-INF/AddUsers.jsp
	modified:   Social_Library/Social_Library-war/web/WEB-INF/web.xml