Debugged C++ version, ready to merge
Merge branch 'cpp' of github.com:btjones16/nemo into cpp