working code now with 3 ifs
Merge branch 'master' of https://github.com/IEOR140-T5/Project3