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

Conflicts:
	index.html