added show for name and drink
added show view
fixed merge conflicts