add echo example
add .gitignore
resolve conflicts