updated index
deleted gitignore
fixed merge conflicts