Fixes tabs
remove .DS_Store from master
Merge remote-tracking branch 'Hjack/tab-fixes'

Updating local master with collaborator Hjack changes