fixing ER diag
fixing merge thingy problem
Merge branch 'master' of https://github.com/molldk/RegionLabeller
gitignore