Some crap conflict involving .DS_Store.. Need to move this to .gitignore