a
Merge branch 'Kelly' of https://github.com/ksenna/to_do_homework into Kelly

Conflicts:
	db/development.sqlite3
Merge branch 'Kelly' of https://github.com/ksenna/to_do_homework into Kelly