Final push! WERK U BRANCH STUFF!
Merge pull request #22 from poppypoppop/dev

Final push! WERK U BRANCH STUFF!