Adding name and duedate fields to tasks
Adding name and duedate fields to tasks
Refactoring Task creation to use a single object/hash
Adding Priorities and one-many relationship with Tasks
Adding priorities, select fields, nav bar, tabular format
Adding Jamies amazing color picker
Sorted task adding
Sorting button
Adding homework updates to tasks and priorities. Secondary sorting, colored tr, colorpicker
recommitted
yea
Merge branch 'master' into dev

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/priorities.js
	app/assets/javascripts/tasks.js
	app/controllers/tasks_controller.rb
	app/models/priority.rb
	app/models/task.rb
	app/views/layouts/application.html.erb
	app/views/layouts/partials/_nav.html.haml
	app/views/priorities/new.html.haml
	app/views/tasks/new.html.haml
	config/database.yml
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	test/fixtures/priorities.yml