Attempting to collapse if/else into one
Merge branch 'master' of github.com:bawjensen/COMP-499-IndependentResearch
Merge branch 'master' of github.com:bawjensen/COMP-499-IndependentResearch
Got alpha beta working, I think