fixed globals
Merge branch 'master' of https://github.com/IvaStevens/NDA_final_project
Merge branch 'master' of https://github.com/IvaStevens/NDA_final_project