Merge pull request #1 from doTheEvolution314/BranchTest

Cool guy commit
Merge pull request #2 from doTheEvolution314/master

Merge pull request #1 from doTheEvolution314/BranchTest