star charts works, line graph testing
small merge error fixed
small merge error