adding .AppleDouble to gitignore and removing alias of cd.
fixing merge