Change-Id: Iecdf5d081c6e287c847ee7861e6b067a7f211f62
Merge branch 'master' of https://github.com/twinklebenedict/myapp.git

Conflicts:
	Sample/.classpath
	Sample/WebContent/index.jsp