minor changes (renaming things)
Merge branch 'master' of github.com:dadleyy/Project-NN