Fixed conflicts with master

.gitignore

.gitlab-ci.yml

AUTHORS.md

Dockerfile

README.md

barcode_example_generator.py

client/components/Hero.jsx

client/components/barcode_example.png

client/components/feedback/EditPanel.jsx

client/components/feedback/FeedbackBlock.jsx

client/components/feedback/FeedbackPanel.jsx

client/views/Exam.jsx

client/views/ExamEditor.jsx

client/views/Grade.jsx

client/views/grade/Grade.css

environment.yml

package.json

redis.conf

requirements-dev.txt

requirements.txt