changed some includes
Merge branch 'master' of github.com:spencerking/CSE20212-Final-Project