Added an x to the file
Add d to the file
Add y to the end of the file
Revert "Add d to the file"

This reverts commit 9d141888a212ad3cfccc388ce5e7faeaa2fb6b89.

Conflicts:
	hello.py
Add new feature 1
Added feature to the master
Merge branch 'feature1'

Conflicts:
	hello.py
Add a few lines of blah-blah
Add some more lines of bs