no message
Merge branch 'master' of github.com:zeraf29/oggle

Conflicts:
	WebContent/WEB-INF/jsp/history.jsp
Merge branch 'master' of github.com:zeraf29/oggle