Alll ready
Merge branch 'master' of https://github.com/ahulad/myproj

Conflicts:
	README.rdoc