Homework #2: Git Merging -- Tech Bootcamp 2014