simplify the merge flow
Merge branch 'master' of github.com:hupili/5carts
add init scripts
how to use 5carts
remove sample
Merge git://github.com/hupili/5carts
type fix
Merge git://github.com/hupili/5carts
support 'author' and 'title'
jekyll server
Merge git://github.com/hupili/5carts
note the wireless workshop today
change base path