Eric's commit as of 2/9
Solve the .DS_Store issue