My new squashed commit

Made some changes

Made some more commits
Made some changes
Made some more commits
Merge branch 'master' of https://github.com/Camomiles/git-test