- Putting things in order.

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

Conflicts:
	css/layout.css
	css/layout_bootstrap.css
	img/img1.PNG
	img/img2.jpg
	js/contact.js
 - changes

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