clean up

remove unused files
add IDE-related files to .gitignore
resolve conflict on README