DS_Store changed
Edited tabs in upload.hbs to avoid merge conflicts