test# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/EverNever/MineClass

Conflicts:
	main/templates/hello.html
Clean All
testPush
Merge branch 'master' of imineclass.tk:/home/mineclass/

Conflicts:
	docs/APIs.md
	main/admin.py
	main/api_users.py
	main/docs/apis.md
	main/escape.py
	main/models.py
	main/templates/apitest.html
	main/templates/static/js/ajaxfileupload.js
	main/templates/static/js/jquery-1.11.1.min.js
	main/templates/static/js/mineclassapi.js
	main/tests.py
	main/timestamp.py
	main/views.py
	manage.py
	mineclass/__init__.pyc
	mineclass/settings.py
	mineclass/settings.pyc
	mineclass/urls.py
	mineclass/urls.pyc
	mineclass/wsgi.py
	mineclass/wsgi.pyc