prototype
index
added untracked files
deleted tmp
prototype
index
deleted tmp
solve conflicts
solve .gitignore conclicts