added not more
Merge branch 'master' of https://github.com/BPTT-test/Project2

Conflicts:
	my_first_text.txt