Merge branch 'branchNewApp' of https://github.com/HelloMars/KuangNei into branchNewApp

Conflicts:
	main/tests.py

增加漂流瓶功能
Merge branch 'branchNewApp' of https://github.com/HelloMars/KuangNei into branchNewApp