ignoring target files
ignoring target
Merge branch 'master' of
https://github.com/Bey0ndZ/TOLCDiscussionForum.git

Conflicts:
	target/classes/edu/tolc/discussionforum/dao/UsersDAO.class
	target/classes/edu/tolc/discussionforum/dao/impl/UsersDAOImpl.class
	target/classes/edu/tolc/discussionforum/service/UsersService.class
	target/classes/edu/tolc/discussionforum/service/impl/UsersServiceImpl.class
	target/m2e-wtp/web-resources/META-INF/maven/edu.tolc/discussionforum/pom.properties