resaving
Merge branch 'master' of https://github.com/militantjones/foliomatch

Conflicts:
	aboutme-public.html
this better fix it