Initial text
Add additional text
Merge branch 'feat-lab1' into develop
Add additional text from develop
Merge branch 'develop'

Conflicts:
	lab1/LAB1.txt