Conflict Fix #2
Added a new file
Conflict fix
mend
Merge pull request #6 from UBC-VCL/pa-lletTown

Added a pokemon
added another penguin line

added my beverage preferences

Conflicts:
	README.md
added another penguin line

added my beverage preferences

Conflicts:
	README.md

trying to squash attempt #2
added another penguin line

added my beverage preferences

Conflicts:
	README.md

trying to squash attempt #2

attempt3