Thank god for backups!

My code somehow randomly exploded with things like this:
================
>>>>>>>HEAD
>>>>>>> 713f06ede81e4a0db2a7bcb85d8dee0c21513089
and other junk like that...
Should be fixed now though.