add a new line
switch to python
merging in the changes in comment style and git is awesome tagline
Merge branch 'master' of https://github.com/ozzloy/git-basics

Conflicts:
	lorem-ipsum.py
Merge branch 'master' of https://github.com/ozzloy/git-basics