mac 1
Merge branch 'master' of https://github.com/paisleysam/paisleysam.github.io

Conflicts:
	index.html