test
test
Merge branch 'master' of https://github.com/IF3110-II-34/IF3110-02-Simple-Blog-Java

Conflicts:
	build/web/WEB-INF/classes/controller/UsersController.class
	build/web/WEB-INF/classes/controller/servlet/LoginServlet.class
	build/web/WEB-INF/classes/controller/servlet/LogoutServlet.class
	build/web/WEB-INF/classes/model/database/MySQL.class
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/java/controller/UsersController.java