first commit
prototype complete
gitignore conflict