Merge branch 'master' of https://github.com/guenhumare/stu

Conflicts:
public/css/main.css
Текстовые файлы для туров
Revert 7943e7b..009ff27

This rolls back to commit 7943e7b57c51ac2c512a4fb003b7a04602c601af.
main.css
Merge branch 'master' of https://github.com/guenhumare/stu