.gitignore
.gitignore
.gitignore merge conflicts resolved
dogm for raspberrypi