Modified   test.txt
Merge pull request #1 from tuyetle/master

Modified   test.txt
Modified   README.md
Modified   README.md
Added      app/fonts/glyphicons-halflings-regular.eot
Added      app/fonts/glyphicons-halflings-regular.svg
Added      app/fonts/glyphicons-halflings-regular.ttf
Added      app/fonts/glyphicons-halflings-regular.woff
Added      app/index.html
Added      app/scripts/app.js
Added      app/scripts/controllers/main-controller.js
Added      app/scripts/directives.js
Added      app/scripts/filters.js
Added      app/scripts/services.js
Added      app/scripts/vendors/bootstrap.js
Added      app/scripts/vendors/bootstrap.min.js
Added      app/scripts/vendors/underscore-min.js
Added      app/styles/bootstrap-theme.css
Added      app/styles/bootstrap-theme.css.map
Added      app/styles/bootstrap-theme.min.css
Added      app/styles/bootstrap.css
Added      app/styles/bootstrap.css.map
Added      app/styles/bootstrap.min.css
Added      package.json
Added      server.js
Modified   README.md
Merge branch 'master' of github.com:hoanguyen311/Q-A-Platform
Added      app/images/13858-940.jpg
Added      app/views/questions-list.html
Modified   package.json
Modified   app/index.html
Added      app/images/logo.jpg
Modified   app/index.html
Modified   test.txt
Merge pull request #2 from tuyencao/master

Modified   test.txt
Modified   app/index.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/main-controller.js
Modified   app/views/questions-list.html
Added      app/scripts/controllers/question-list-controller.js
Merge pull request #1 from hoanguyen311/master

New pull request
Merge pull request #1 from hoanguyen311/master

New pull request
commit question list
Merge pull request #3 from tuyencao/master

add question controller
Modified   app/index.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Merge branch 'master' of github.com:hoanguyen311/Q-A-Platform

Conflicts:
	app/views/questions-list.html
Merge pull request #1 from hoanguyen311/master

Add ask question view and controller