Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/index.html
Merge branch 'master' of https://github.com/kcnandu88/Ancestry

Conflicts:
	WebContent/index.html