removed some unnecessary files (.DS_Store)
uhhh trying to merge?