#commit 3
Merge branch 'master' of github.com:jasonkoh2012/testGit

Conflicts:
	web/index.jsp