changing diff for git
Merge branch 'master' of github.com:stevenweaver/dot_files