Changed the tabwidth to 4 columns.
Reverted the previos commit.
Merge branch 'master', remote-tracking branch 'origin'
Added .DS_Store to .gitignore.