working?
updating
Merge branch 'master' of https://github.com/sschnobr/practice

Conflicts:
	text.txt