NEW
Merge remote-tracking branch 'origin/master'

Conflicts:
	exam-code/css/bootstrap.css
	exam-code/img/flag.svg
	exam-code/img/sdgfdfh.svg
	exam-code/index.html
	exam-code/js/bootstrap.min.js
	exam-code/js/script.js
	exam-code/page.css