added some lines
Merge branch 'master' of github.com:paweljasinski/crlf

Conflicts:
	foo.py