Revert "Merge branch 'master' of https://github.com/ThePenguin1140/NSO-App"

This reverts commit 505443adcff2803f3bc8c8fde7402f5281a19497, reversing
changes made to e4eaf119a88752cdedda98c69e2050a014b2df23.
revert to working copy