dsd
\Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale

Conflicts:
	error.log
xxMerge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale

Conflicts:
	app/views.py
	error.log
sdf
asfMerge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale

Conflicts:
	app/views.py
	error.log
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
add product sample