nothing
delete pycache
Merge branch 'master' of https://github.com/gurpreetatwal/hack61a

Conflicts:
	__pycache__/classes.cpython-34.pyc
new error~
Merge branch 'master' of https://github.com/gurpreetatwal/hack61a

Conflicts:
	__pycache__/classes.cpython-34.pyc
	__pycache__/data_new.cpython-34.pyc