edit pc
Merge remote-tracking branch 'origin/master'

Conflicts:
	secondPage.html
edit last pc