-rename states 
-different colors states
Merge remote-tracking branch 'origin/master'