no message
Merge branch 'master' of https://github.com/aV1rus/Capstone_Project

Conflicts:
	capstone/settings.py