commit for pull initial state
Merge branch 'master' of github.com:TheFuzzy/NTU-CZ3003-CMS
Demo template
Demo template
Merge branch 'master' of github.com:TheFuzzy/NTU-CZ3003-CMS

Conflicts:
	backend/storm/requirements.txt
	backend/storm/storm/settings.py