merge local
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared