added more content and gitignore
fixing merge conflicts