Moved tools folder inside i3 folder
Changed paths after moving tools folder
Merge branch 'master' of github.com:olemartinorg/dotfiles

Conflicts:
	i3/tools/pytools/cmds.py