Messed with marvel, now runs in a blistering 15 minutes
Merge branch 'master' of https://github.com/shellhead/csci3511-assignment2