pdate
Merge branch 'master' of https://github.com/Calvintran1/Calvintran1.github.io

Conflicts:
	Home.html
	Main/Home.html
	Main/home.html