Add dockerfile syntax
Merge branch 'master' of github.com:xbudex/dot-files

Conflicts:
	.gitmodules