Merge branch 'Branch-2'

Conflicts:
	readme.txt
Delt with the merge conflict

I had to go into the file and delete the header & some of the extra
text.