azandra
merged my name with previous names
Merge branch 'master' of github.com:ozzloy/git-basics

Conflicts:
	lorem-ipsum.py