Not the latest version
Merge branch 'master' of https://github.com/chloekaianlam/Portfolio

Conflicts:
	index.php