Initial commit from work
Merge remote-tracking branch 'dotfiles/master'
Renamed .files to files