Testing dash
Fixing conflict 1
Merge branch 'master' of https://github.com/Tundra-Python/AppetEYES
Fixed conflicts