Local change and upstream change at same time
Merge branch 'master' of https://github.com/sebuzi/project1

Conflicts:
	index.html
Merge branch 'master' of https://github.com/sebuzi/project1