master switch #2

Open

hartErik1990 wants to merge 2 commits intoDevMountain:masterfrom

hartErik1990:master

Commits on Jan 20, 2018

updated to GitHub hope it works out
hartErik1990
committed

Commits on Jan 21, 2018

Finally was able to fix the error where they switch wasn't working.
hartErik1990
committed