Initial commit
new files
Merge github.com:vhdmsm/Web_Project_Final
first push in this project to sync codes
first push in this project to sync codes
first push in this project to sync codes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	Home/initDB.py
	Home/models.py
	README.md
	Web/forms.py
	Web/settings.py
	Web/urls.py
	db.sqlite3
	static/bootstrap-3.0.3-dist/dist/css/bootstrap.css
	static/bootstrap-3.0.3-dist/dist/css/bootstrap.min.css
	static/css/theme.css
	static/js/myJQuery4.js
	static/js/page3_ajax.js
	templates/base.html
	templates/home.html
	vendor/templates/add_product.html
	vendor/templates/vendor_base.html
	vendor/views.py
test