Remove DS_Store
Merge branch 'master' of https://github.com/pcutler/pcutler-web

Conflicts:
	blog/wp-content/themes/.DS_Store