1231
Merge branch 'master' of
https://github.com/cloudFinal/CloudFinalProject.git

Conflicts:
	WebContent/index.jsp