first commit

first commit
?

?
commit

commit
new
Merge branch 'Kelly'
Merge branch 'Sid'

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/049031c10ee08de207cbc3dedcbf8d60
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2bca5ea8116b32a4dba38704f118bdc8
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/45114af13efec1031b463cc1e1143b66
	tmp/cache/assets/development/sprockets/510fde79a20e8aaffb017a3db50eba37
	tmp/cache/assets/development/sprockets/5537d9d64c8f9f0efa9b15f5fe2a4331
	tmp/cache/assets/development/sprockets/88b3bf7f952325e62c1bd5b827dd5b2f
	tmp/cache/assets/development/sprockets/994811b00ede0e61a11559f1d12f00b7
	tmp/cache/assets/development/sprockets/a6374daa039d522d100dcba1363631d8
	tmp/cache/assets/development/sprockets/aafe3da0a439899576b3860ce711c44d
	tmp/cache/assets/development/sprockets/b00fb2c6a26e0eb40d0ba8b85a9e3a5b
	tmp/cache/assets/development/sprockets/b1b39c82a9be8120583b93f5fe4a45dd
	tmp/cache/assets/development/sprockets/bb95fa577c39a0e789aa7ab6dc00626f
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
Merge branch 'master' of https://github.com/ksenna/to_do_homework