added lineColor and circleTest2, modified makefile
Merge branch 'master' of https://github.com/eecs452/eecs452maav

attempting to pull?