apps
Merge branch 'master' of github.com:mattly/dotfiles

Conflicts:
	Makefile