fix_me.rb

<<<<<<< HEAD

# This is where the code that was pushed to master by your teammate was added.  It was added 

# after you created the current branch you are working on.  That's why you have conflicts!

=======

# This is where some dead code, that your team mate deleted would be.

# This is also where your new code lives. You certainly want to keep these!

>>>>>>> Allows only tea to be uploaded in the caffine section (this is your commit message)