god knows why I have a modified .ds_Store
more unknown workspace things
Merge branch 'master' of https://github.com/charlottefranklin/charlottefranklin.github.io

Conflicts:
	.idea/workspace.xml