To pull
Merge branch 'master' of https://github.com/iamadamhair/personal_site

Conflicts:
	.DS_Store
	images/.DS_Store