conclusion
Merge branch 'master' of https://github.com/viktorievasova/thesis
final
Merge branch 'master' of https://github.com/viktorievasova/thesis

Conflicts:
	thesis.pdf