at the begining
Merge branch 'master' of github.com:xhan/rubyrb

Conflicts:
	.gitignore
	README.md