1st branch commit
2nd branch commit
Third branch commit
Merge branch 'workingbranch'

Conflicts:
	readme.txt