del file
Merge branch 'master' of github.com:Steven-Eardley/mt

Conflicts:
	Assignment1/ibm1.py~
working hard