added all colors to peopleSprites
changed way to set Person.sprite_settings
Merge remote-tracking branch 'origin/master'
Makefile now compiles and watches complete directory with sub directories