Merge pull request #3 from hoanguyen311/master

asking form
Merge pull request #10 from tuyencao/master

edit questions JSON
Merge pull request #3 from hoanguyen311/master

Update
Merge pull request #11 from tuyencao/master

add description field
commit
askquestion
Merge pull request #12 from thaodta/master

Merge pull request #4 from hoanguyen311/master
Added      app/views/question-details.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/views/questions-list.html
Modified   app/index.html
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Merge pull request #4 from hoanguyen311/master

Update data
Merge pull request #4 from hoanguyen311/master

Update data
cm
Merge pull request #13 from tuyetle/master

update filter category
update
Merge pull request #14 from tuyetle/master

update
Merge branch 'master' of https://github.com/hoanguyen311/Q-A-Platform into hoanguyen311-master

Conflicts:
	test.txt
Modified   app/index.html
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Added      app/styles/custom.css
Modified   app/index.html
Modified   app/index.html
Modified   app/views/questions-list.html
Modified   app/styles/custom.css
Modified   app/views/questions-list.html