first commit don't wait this long
Merge branch 'homework' of github.com:kplandes/ajax_todo into homework

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/todos_controller.rb
	app/models/todo.rb
	app/views/layouts/application.html.erb
	app/views/todos/index.html.erb
	app/views/todos/new.html.erb
	config/application.rb
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml
	db/schema.rb
	test/fixtures/todos.yml