file
Merge branch 'master' of https://github.com/petternygren/dots

Conflicts:
	debinst.sh