merge issue
Merge branch 'master' of https://github.com/harrmi02/harrmi02.github.io

Conflicts:
	MainLook.css
	Resume.html
	ToDo.css
	index.html
	todo.html