Little bit of info
Merge branch 'master' of github.com:hendriklammers/dotfiles

Conflicts:
	README.md