textfile edit
fixing readme file merge conflict with won and master branch
Merge branch 'won' of http://github.com/codedproject/jubclub