added .gitignore
merging completion
cleanup
code cleanup