listing all tasks
all tasks for html
Pushed to backbone
Resolved conflicts
Finished READ/CREATE
Udpated
Merge branch 'master' into backbone

Conflicts:
	app/assets/javascripts/tasks.js
	app/assets/stylesheets/common.scss
	app/views/tasks/index.html.erb
	config/routes.rb
skipping auth token for csrf
Fixed typo in controller
Finished CREATE/READ/DELETE
Finished CRUD