initial commit
merge with remote
add rspec