Merge branch 'master' of https://github.com/kevinvn1709/project-me

Conflicts:
	index.html
c
Merge branch 'master' of https://github.com/kevinvn1709/project-me
c