putting gitignore back to how it was. had merge data in it.
putting gitignore back to how it was. had merge data in it.
UWPCE-PythonCert/IntroPython2016,weidnem/IntroPython2016,weidnem/IntroPython2016,weidnem/IntroPython2016,UWPCE-PythonCert/IntroPython2016,Baumelbi/IntroPython2016,UWPCE-PythonCert/IntroPython2016,Baumelbi/IntroPython2016