# Conflicts:
#   .gitlab-ci.yml
#   Gemfile
#   README.md
#   _config.yml
#   _config_production.yml
#   _layouts/default.html
#   _layouts/page.html
#   academic-conduct.md
#   assets/css/style.scss
#   assignments/describing-video-image.md
#   assignments/disabilityjustice.md