fix merge
Merge branch 'master' of https://github.com/loufellis/Senior-Capstone
Teacher 40p done