change module 2 text
Merge branch 'dev'

Conflicts:
	module_2.txt
bug