CSCI3308-SoftwareDev My name is Ana-Sophia Brande and this is Lab 3 for CSCI-3308 Spring 2017 This might cause a merge conflict Partner: Eric Junkins Eric's merging message