fixing conflicts

.DS_Store

.tmp/mocha-webpack/455fffbb3125fc1ebc427c559e4e5438-entry.js

assets/js/NotificationPage.jsx

assets/js/ProfilePage.jsx

assets/js/VacancyPage.jsx

assets/js/__test__/NotificationPage-test.jsx

assets/js/__test__/ProfilePage-test.jsx

assets/js/__test__/VacancyPage-test.jsx

assets/js/components/TopMenu.jsx

assets/js/components/Vacancy.jsx

core/admin.py

core/serializers/vacancies.py

core/views/vacancies.py

...les/company-logo/345e9f8e-026e-455c-a9b9-95b684a8b694.png

...les/company-logo/968bd495-73ae-4b4b-bed6-6ae1371c4cf0.jpg

...les/company-logo/9e6192af-8d4e-4870-be58-667f7e6a58b5.png

...les/company-logo/aa2fc488-54b0-40b9-b595-2a065de114f2.png

...les/company-logo/aaf8e204-0435-4a36-a292-bcdd66e1dda9.png

...les/company-logo/bddd0d72-0822-486a-9524-d4b4996c6ba9.jpg

...es/student-photo/03028660-90b1-4f60-881b-476e5e0125b5.jpg