got wolfram working
Merge branch 'master' of https://github.com/mbojey/COSC310A2 into ethan