22
Merge branch 'master' of https://github.com/RyanHuangPMA/MyTestRepo.git

Conflicts:
	RyanGitTest/WebContent/NewFile.jsp