set up a practice chart
fixed merging conflicts
fixed merging conflicts on testing branch
Merge branch 'testing/chart' into feature/chart