finished initial course query form, and disabled csrf
commented out bug
fixed merge conflicts