physics and drawing
gitignore
resolved conflicts