dotfiles
Merge branch 'master' of https://github.com/appmik/dotfiles

Conflicts:
	.gitmodules

	deleted:    .gitmodules