Fixed some random git shtuff. 

Anytime you see <<<<<<< HEAD, it means that I forgot to resolve changes with one of my merges.