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

Conflicts:
	web/create_user.xhtml