Saved proress so that we don't break everything
updated parser, added fib
Merge branch 'master' of https://github.com/Swofty/HackCMU-2014