Fixed some random junk in my files.

-<<<<<<< HEAD?
Probably junk from github or something