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
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
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
Deleted    app/compare.html
Modified   app/css/compare.css
Modified   app/index.html
Modified   app/partials/compare.html
Modified   app/partials/phone-list.html