v2 origin
auto commit
add homepage. mkdir three seperate directions
use nodejs express
ignore  node_modules
auto commit
add carousel slide. add user account
auto commit
add admin control page
complete add delete modify page.
auto commit
remove unrelated file
auto commit
get rid of old master and merge with v3
Merge remote-tracking branch 'origin/v3'

Conflicts:
	gitsubmit.sh
	public/images/shangwu.jpg
	public/images/wedding.jpg
	public/images/xiaomilogo.png
	public/images/zijia.jpg
	public/javascripts/jquery.easing.js
	public/javascripts/jquery.min.js
	public/javascripts/jquery.simplemodal.js
	public/javascripts/jquery.smooth-scroll.js
	public/javascripts/sly.js
	test/car1.jpg
	test/index.html
only master left