nothing
Merge branch 'master' of https://github.com/DerekYangYC/TinyQuotation

Conflicts:
	.idea/workspace.xml
	quotation/views.py
add gitignore