adding main app with drink model
merging conflicts