sotr: quick examples
gitignore
updated gitignore
resolve conflicts