Little Cleaning up

I took out the conflicts page from the header, and added the option to
upload a conflicts file in the add class page