Finally have my own computer back...
Recap of computer hell:
Buy a computer on Craig's List for a back up.
Noisy CPU fan goes out on my computer.
Set up spare computer.
GF's computer, which has had issues for a while, dies.
Bought replacement fan from Newegg and install.
Plug computer in at tower to test fan, neglecting to shut off power strip or power supply.
Pop, flash, smoke...
Bought used motherboard and power supply and rebuilt computer with a lot of help from a guy I met on Craig's List, using the best parts from the 2 fried computers.
Back in business.