first commit
Merge branch 'master' of github.com:koumei2013/rr

Conflicts:
	.gitignore