Rename README.rdoc to README.md
Delete README.md
Merge branch 'master' of https://github.com/WispOfGG/first_app

Conflicts:
	README.rdoc