first commit
rspec structure
gemfiles added
class user done
start working with dish class
merge conflict