Add initial main menu code & cleanup test state.
Remove unneeded includes.
Merge branch 'master' of github.com:dadleyy/Project-NN
Add basic update to Main Menu.