- Update

Signed-off-by: tuyetphale993 <tuyetphale993@gmail.com>
Merge branch 'OpenCart' of github.com:quangthi90/Training072014 into OpenCart

Conflicts:
	Topic 6/database.txt

Signed-off-by: tuyetphale993 <tuyetphale993@gmail.com>
 - Use bootstrap

Signed-off-by: tuyetphale993 <tuyetphale993@gmail.com>