Week Two NSS

Week Two of NSS
Revert "Week Two NSS"

This reverts commit 1dfc12f29705a0ccbabe44b58ec702c124219448.
Merge branch 'master' of https://github.com/Raynemaeker/NSS-FrontEnd