Merging in my code - still learning this whole Git thing