context stuff
Merge branch 'master' of https://github.com/NewME310/FinalPaper