add home
Merge branch 'master' of https://github.com/dungmickey/SmartPhone
Merge pull request #2 from hungpham/master

get data
edit home.css, index.html, controller.js, phone-list.html
Merge pull request #7 from dungmickey/master

1012121
Modified   app/compare.html
Modified   app/css/compare.css
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/partials/phone-detail.html
Modified   app/partials/phone-list.html
Modified   package.json
Add        app/js/lang-en.json
Add        app/js/lang-fr.json
Add        app/js/vendor/angular/angular-translate.js
Add        app/js/vendor/angular/loader-static-files.js
Merge remote-tracking branch 'remotes/hung/master'

Conflicts:
	app/index.html
	app/js/controllers.js
	app/partials/phone-list.html
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/js/lang-en.json
Modified   app/js/lang-fr.json
Modified   app/css/home.css
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/js/lang-en.json
Modified   app/js/lang-fr.json
Merge pull request #8 from dungmickey/master

update sort and language
Merge branch 'master' of https://github.com/johnsonpham/SmartPhone
Modified   app/css/home.css
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/partials/phone-list.html
Modified   app/phones/phones.json
Merge branch 'master' of https://github.com/dungmickey/SmartPhone
Modified   app/css/home.css
Modified   app/js/controllers.js
Modified   app/partials/phone-list.html
Modified   app/index.html
Modified   app/js/lang-en.json
Modified   app/js/lang-fr.json
Modified   app/partials/phone-detail.html
Merge remote-tracking branch 'remotes/dung/master'

Conflicts:
	app/index.html
	app/js/lang-en.json
	app/js/lang-fr.json
Merge pull request #9 from dungmickey/master

update home.css, controller.js, phone_list.html  - merge without preview
Deleted    app/compare.html
Modified   app/css/compare.css
Modified   app/index.html
Modified   app/partials/compare.html
Modified   app/partials/phone-list.html
Modified   app/css/compare.css
Modified   app/partials/compare.html
Modified   app/partials/phone-detail.html
Modified   app/index.html
Modified   app/partials/phone-list.html