aliases
wall
gitconfig
Merge branch 'master' of https://github.com/singuerinc/dotfiles

Conflicts:
	.gitconfig
	.singuerinc
pref
Merge branch 'master' of https://github.com/singuerinc/dotfiles

* 'master' of https://github.com/singuerinc/dotfiles:
  slate f13 macbook screen