update catagory IDs
Merge pull request #4 from hoanguyen311/master

Update data
Merge branch 'master' of https://github.com/tuyencao/Q-A-Platform

Conflicts:
	app/scripts/services.js
Merge pull request #20 from tuyencao/master

Adding files
Merge branch 'master' of https://github.com/dluyllong/Q-A-Platform
Add        app/fonts/glyphicons-halflings-regular.eot
Add        app/fonts/glyphicons-halflings-regular.svg
Add        app/fonts/glyphicons-halflings-regular.ttf
Add        app/fonts/glyphicons-halflings-regular.woff
Add        app/images/13858-940.jpg
Add        app/images/logo.jpg
Add        app/images/sprites.png
Add        app/index.html
Add        app/scripts/app.js
Add        app/scripts/controllers/answer-controller.js
Add        app/scripts/controllers/question-controller.js
Add        app/scripts/cookies.js
Add        app/scripts/directives.js
Add        app/scripts/filters.js
Add        app/scripts/services.js
Add        app/scripts/vendors/angular-cookies.js
Add        app/scripts/vendors/angular-resource.js
Add        app/scripts/vendors/angular-route.js
Add        app/scripts/vendors/angular.js
Add        app/scripts/vendors/bootstrap.js
Add        app/scripts/vendors/bootstrap.min.js
Add        app/scripts/vendors/underscore-min.js
Add        app/styles/bootstrap-theme.css
Add        app/styles/bootstrap-theme.css.map
Add        app/styles/bootstrap-theme.min.css
Add        app/styles/bootstrap.css
Add        app/styles/bootstrap.css.map
Add        app/styles/bootstrap.min.css
Add        app/styles/custom.css
Add        app/views/ask-question.html
Add        app/views/question-details.html
Add        app/views/questions-list.html
Merge pull request #7 from hoanguyen311/master

Update
update link
udpate back top
udpate back top
Merge branch 'master' of https://github.com/tuyetle/Q-A-Platform
update css custom.css
Merge pull request #6 from tuyetle/master

update back top