made a change
made yet another change
commiting
Merge branch 'deleteme'

Conflicts:
	deleteme2
added some text
added version file
Merge branch 'hotfix'