I MADE THE FIRST CHANGE
Merge origin/master

Conflicts:
	src/main/webapp/index.html
Merge origin/master

Conflicts:
	src/main/webapp/index.html
added a person class and modified index.html
added a person class and modified index.html