Ivans changes
Merge branch 'master' of https://github.com/OAlm/software_engineering_docs

Conflicts:
	project_work_assignment/project_description.md