fixed typo
removed debug statements
removed debug statement
replace windows apostrophes with regular apostrophes
removed .DS_Store
trying to resolve conflicts