f

f
Merge branch 'master' of https://github.com/WadeNiday/wadeniday.github.io

Conflicts:
	.DS_Store