More blahs
Merge branch 'master' of https://github.com/jlev/git-demo into creative_writing

Conflicts:
	file.txt
Eradicated Gin's contribution.
Merge branch 'master' of https://github.com/jlev/git-demo into creative_writing

Conflicts:
	file.txt
kept everything...
Added a blah
Merge commit '19363c5c0cd6bdeec8e43a4db48ae0ec16bc8b35'