Clean Up
Merge branch 'master' of https://github.com/marjoripomarole/dotfiles

Conflicts:
	makesymlinks.sh