Added README.txt
Updated README.txt
Added cool new feature
Fixed bug#1234
Fixed typo in README.txt and added additional info about other features
Added .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt