color.c added
Merge branch 'dev' of https://github.com/3Legs/hw2 into dev