all
12
1.py
Merge https://github.com/AisenCool/DataTechnology

Conflicts:
	data/1.dat