notes for kindle
Merge branch 'master' of https://github.com/realpsyence/dotfiles
fixed conflict
Conflicts:
	command_line_fu