Formatting, Fixed Conflict Window

Formatting:
-Ran auto formatter and import fixed for all files
-Added copyright info to more files
-Removed extraneous methods from Subject
Conflict Window:
-Conflict window now stores selected class names
-You can now deselect classes in the window
Just for Avi:
-Reinstantiated arrow key browsing in class selection window