moving files into directories
oh hey it runs
adding osx defaults
adding git defaults
Merge branch 'dev'