Merge pull request #2 from cs109/master#14

JonathanCampbell wants to merge 1 commit into

cs109:mastercs109/2015:masterfrom

JonathanCampbell:masterJonathanCampbell/2015:masterCopy head branch name to clipboard