made changes to my curr dir
Please enter the commit message for your changes. Lines starting
correcting conflicts
github.com/katiea/537-p5

Conflicts:
	Makefile