starting app.py and colors.html
merge conflict