begin combine
autoformatting
linking between both and partial cleanup
Merge pull request #5 from e-cooper/rakyu

merging both charts