added code for first test
rspecs for completion
added more tests
merge conflict