first commit
Merge https://github.com/EricGWright/NSS-Cal