Update HomeworkAssignments.md
Update HomeworkAssignments.md
Checking in
Merge branch 'master' of github.com:tibbon/WDI_Summer_Public
End of class
Update HomeworkAssignments.md
Update HomeworkAssignments.md
Update HomeworkAssignments.md
Update HomeworkAssignments.md
new info
Merge remote-tracking branch 'upstream/master'

Conflicts:
	examples/rails-todo-with-contacts/todo_app/app/controllers/todos_controller.rb
	examples/rails-todo-with-contacts/todo_app/app/views/todos/show.html.erb
	examples/rails-todo-with-contacts/todo_app/config/routes.rb