Adding NAN
Merge branch 'develop' of github.com:DevlinLiles/JediTraining into develop