Main pull request#278

Mcscout05 wants to merge 2 commits intoMarkFuller1:mainMarkFuller1/SuperCoolProject:mainfrom

Mcscout05:mainMcscout05/SuperCoolProject:mainCopy head branch name to clipboard