working on W8C-3
add three files
main.css
initial_data.json
serializers.py
working on W8C-3
remove .pydevproject
add .pydevproject
commit .pydevproject
Merge branch 'feature_W8C-3' into CChang_develop

Conflicts:
	accounts/settings.py
	djangotest/static/css/main.css
	shops/serializers.py
W8C-3 complete
commit shops serializers.py
Merge branch 'W8C-3' into develop

Conflicts:
	shops/serializers.py