Deleted files in wrong repo.
Fixed merge errors.
adding if name==main block
removed unused variabel
Pulling the screen-printing functions out of the setup() function
Pulled more code out of intro(). Added docstring for intro(). This function is now very small, and all the writing/reading from the screen is handled by helper functions rather than cluttering up the logic of intro()
Invalie input in setup now cycles back to start of that function, rather than to start of setup. Fixed bug where 'return ai' was called even if ai hadn't been assigned
1) pulling out another instance of _goodbye()
2) Starting work on creating a board class, rather than having the game logic explicitly depend on the board's data structure
1) adding .gitignore file for .pyc and *~
2) adding embryonic unittest file for connectfour
3) pulling stalemate checking into the board class
pulling playerturn() functionality into the board class
adding test functions for playermove(), and exception if it's called with bad board data
Fixing error in playerturn() that only considered 1st 6 cols of board.

I added a testcase to show that it breaks and that my fix works on this test case. However, the AI now plays really really stuipdly.
pulling the code in charge of displaying winner into separate function
adding comments for places that I think need work