1
wes
oil
123
test commit
`
Merge branch 'master' into hash
t commit1
Merge branch 'hash' of https://github.com/nromanen/Ch-025
commit all
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/src/main/webapp/WEB-INF/templates/default/footer.jsp
	SSEL/src/main/webapp/WEB-INF/templates/default/menu.jsp
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/home.jsp