lalalalla
Merge branch 'master' of https://github.com/thomafred/xingyi_tom

Conflicts:
	.idea/workspace.xml
	main.py