commit
commit
commit
commit
d
temp
update
Merge branch 'master' of https://github.com/kanikab/PhpProject1.git

Conflicts:
	index.html