error pages
jsp with el
thymeleaf final
thymeleaf

thymeleaf
thymeleaf
ignore file
fianl thymeleaf
Merge remote-tracking branch 'origin/error_branch' into all_in_one

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml

merging error branch with all_in_one branch, fixed pom.xml and web.xml conflicts
Merge remote-tracking branch 'origin/thymeleaf' into all_in_one

merging thymeleaf and all_in_one branches
Merge remote-tracking branch 'origin/thymeleaf_final'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
changed name2.jsp