test squash commit
Merge pull request #1 from cgcgbcbc/test_squash_merge

test squash commit