updated the readme file
branch demo
what what
funk funk
fixed conflict
creating conflict
feel funk
Merge branch 'development'
fixed a line
Conflicts:
	README.rdoc
Merge pull request #1 from MollyMoile/development

Development