added git ignore
modified js
added gitignore file
removing .ds_store files
fixing merge conflicts