add Result5
Merge branch 'master' of github.com:ejustech/iron
Merge branch 'master' of github.com:ejustech/iron

Conflicts:
	WebRoot/WEB-INF/struts-config.xml
	WebRoot/jsp/result2.jsp
	WebRoot/jsp/result3.jsp
	WebRoot/jsp/result4.jsp
	WebRoot/jsp/result5.jsp