Merge branch 'master' of https://github.com/OmathiasO/myPortfolio

Conflicts:
	index.html