Removed my commit messages so Hawks can find out what's wrong!
Fixed merge conflicts for Poppy
worked on the machines
Merge pull request #8 from poppypoppop/dev

Because I need to learn Git more