Ignore untracked in octomacs.
Merge branch 'master' of github.com:sandinmyjoints/.emacs.d

Conflicts:
	.gitmodules