Merge branch 'master' of /home/sheldon/PycharmProjects/UniRate with conflicts.
many
many
fd
aaa
decor
deleted all templates
Merge remote-tracking branch 'origin/master'