Implementing part 1 of 2 subfeatures
Merge branch 'master' into development

Conflicts:
	text.txt
Part 2