Resolved merge conflict for requirements.txt.

Also it doesn't actually run right now since the actual code got moved into the `eecs183style` so maybe fix that?