new file:   app/views/cheuksgroup/rongdas/rongda.html.erb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/views/store/orders/new_mobile.html.erb