mdfy GUI readme
Merge pull request #4 from SeanXP/master

change Store -> Shop in README.md
Revert "Programmer-Database Design"

This reverts commit d1410ffc1e105cea3960bd6ab496a17eb370a5f6.
shop+commodity+adv classes
other
Merge branch 'master' of github.com:XDSPMGroup/parknshop

Conflicts:
	Pro/anybuy/anybuy/settings.py
	Pro/anybuy/anybuy/settings.pyc
	Pro/anybuy/db.sqlite3
update .gitignore file
add Plan.xml you can opne it in windows
test

add my name
commit .sql and .pyc
update setting
conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pro/anybuy/db.sqlite3
	Pro/anybuy/system/models.pyc
	Pro/test.md
modify database

modify database of advertisement
update db
coding store classes
Merge branch 'master' of github.com:XDSPMGroup/parknshop
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pro/anybuy/anybuy/settings.pyc
	Pro/anybuy/db.sqlite3
	Pro/anybuy/system/__init__.pyc
	Pro/anybuy/system/admin.pyc
	Pro/anybuy/system/models.py
	Pro/anybuy/system/models.pyc
Add class cart and favorite
Add cart and favorite class to container