ignore todo.txt
remove scm shit
Merge branch 'master' of github.com:vise890/dotfiles
add a todo
Merge branch 'master' into osx

Conflicts:
	zshrc