init
first commmit
merge
Merge branch 'master' of github.com:lytsingsun/rspec_test

Conflicts:
	.gitignore