Merge pull request #1 from BCPR203/master

Merge pull request #1 from troy123225/master
yay
Merge branch 'master' of https://github.com/troy123225/ExampleProject
Merge pull request #2 from troy123225/master

merge me!