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

Conflicts:
	log/development.log
	tmp/pids/server.pid
Merge branch 'master' into Sid
bootstrappin'
a
Merge branch 'Kelly' into Sid
Merge branch 'Kelly' into Sid

Conflicts:
	app/views/assignees/_form.html.haml
	app/views/assignees/edit.html.haml
	app/views/assignees/index.html.haml
	app/views/assignees/new.html.haml
	app/views/assignees/show.html.haml
	config/routes.rb
	db/development.sqlite3
	log/development.log

tmp/cache/assets/development/sass/2dfa287b8454ab0e2ef3f7c68e32688628930f
4f/assignees.css.scssc

tmp/cache/assets/development/sass/2dfa287b8454ab0e2ef3f7c68e32688628930f
4f/tasks.css.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_alerts.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_background-variant.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_border-radius.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_buttons.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_center-block.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_clearfix.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_forms.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_gradients.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_grid-framework.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_grid.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_hide-text.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_image.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_labels.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_list-group.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_nav-divider.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_nav-vertical-align.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_opacity.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_pagination.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_panels.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_progress-bar.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_reset-filter.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_resize.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_responsive-visibility.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_size.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_tab-focus.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_table-row.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_text-emphasis.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_text-overflow.scssc

tmp/cache/assets/development/sass/ae099c9232759469331b4ce4d02acb1fe8fc27
de/_vendor-prefixes.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_alerts.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_badges.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_breadcrumbs.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_button-groups.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_buttons.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_carousel.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_close.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_code.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_component-animations.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_dropdowns.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_forms.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_glyphicons.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_grid.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_input-groups.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_jumbotron.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_labels.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_list-group.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_media.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_mixins.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_modals.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_navbar.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_navs.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_normalize.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_pager.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_pagination.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_panels.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_popovers.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_print.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_progress-bars.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_responsive-embed.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_responsive-utilities.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_scaffolding.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_tables.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_thumbnails.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_tooltip.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_type.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_utilities.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_variables.scssc

tmp/cache/assets/development/sass/d3629239ec5dce3c704a7b980e99047294c984
82/_wells.scssc

tmp/cache/assets/development/sass/ded328bfb801a5f6a6a9c54914410136c562b0
c8/bootstrap.scssc
	tmp/cache/assets/development/sprockets/049031c10ee08de207cbc3dedcbf8d60
	tmp/cache/assets/development/sprockets/05814218fa2870dfafd7a7565998c64c
	tmp/cache/assets/development/sprockets/07df17dccdfae51396d9151640b28b72
	tmp/cache/assets/development/sprockets/123156a5fc73d6b96c8db7aa19fdff2a
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1907c7f62bf6c4159898401fefe9c1d3
	tmp/cache/assets/development/sprockets/1a01090d2d9f052b4fce8f960945ac10
	tmp/cache/assets/development/sprockets/1ee97d54f519184002a33620521cb89e
	tmp/cache/assets/development/sprockets/20c49dc8e8ee691bd73c63e167b940ab
	tmp/cache/assets/development/sprockets/21b2d824ba8fcbf9ce465cd31570156c
	tmp/cache/assets/development/sprockets/28383075930d73fbef4c6da410414cde
	tmp/cache/assets/development/sprockets/283a8333eb92c3bcdb6e92e345a35be7
	tmp/cache/assets/development/sprockets/2bca5ea8116b32a4dba38704f118bdc8
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/3253417dde5bb2875057346261039306
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/3593d9585dc33ae4616e511451b9082d
	tmp/cache/assets/development/sprockets/39b59fe234a7a029658ac80e6d8e328e
	tmp/cache/assets/development/sprockets/3ec644c4d180e2a8e13c98c76e02fb9b
	tmp/cache/assets/development/sprockets/45114af13efec1031b463cc1e1143b66
	tmp/cache/assets/development/sprockets/468846fdafa41b7ac4821748758e5ba0
	tmp/cache/assets/development/sprockets/468b44d69ad916c81af6630cb22bc3a8
	tmp/cache/assets/development/sprockets/50df98deb30d09590c2df995f77ce32b
	tmp/cache/assets/development/sprockets/510fde79a20e8aaffb017a3db50eba37
	tmp/cache/assets/development/sprockets/521ae1dcf628e09051958ec950ec9223
	tmp/cache/assets/development/sprockets/5537d9d64c8f9f0efa9b15f5fe2a4331
	tmp/cache/assets/development/sprockets/5df6e3438f4b3ceb666a11bcaa147225
	tmp/cache/assets/development/sprockets/621f2901268baa89f97acbed2272b969
	tmp/cache/assets/development/sprockets/6437a20c4988e8c57193256519000369
	tmp/cache/assets/development/sprockets/655862408e307b50d0c61ab9506865b8
	tmp/cache/assets/development/sprockets/67da84976e3d3985d1b0751cfee142b3
	tmp/cache/assets/development/sprockets/69c2ca80e74748df375cf74d850192a5
	tmp/cache/assets/development/sprockets/6d9ae8304e2a01da22292858f74011bc
	tmp/cache/assets/development/sprockets/6dd03b72d75b3421f57dccf7d0eeb915
	tmp/cache/assets/development/sprockets/6eeb1b8b64ac36c2128c9e03161d9303
	tmp/cache/assets/development/sprockets/6fdb160b7152b783d00a5ede6b3eaa61
	tmp/cache/assets/development/sprockets/71364f667aee83e67b2adf74e7eb6ab5
	tmp/cache/assets/development/sprockets/74a2f130104d53ff9bca9ac1404f0799
	tmp/cache/assets/development/sprockets/762040786b811fdf4aeb1b29ed0dd369
	tmp/cache/assets/development/sprockets/7b3315c775b2be4030227ac11b929750
	tmp/cache/assets/development/sprockets/7b872f9f5a0ec6556441bed913d86b81
	tmp/cache/assets/development/sprockets/88b3bf7f952325e62c1bd5b827dd5b2f
	tmp/cache/assets/development/sprockets/8c7f589b8e50d9c51e46fa5a2c3b8d0d
	tmp/cache/assets/development/sprockets/8cee09deb5227e186af1dc8dd7c6f521
	tmp/cache/assets/development/sprockets/8fcb0e14fb1d3f24c7ce5cc9e0089d87
	tmp/cache/assets/development/sprockets/916e4bf7928a47d75c72cba9e00d9633
	tmp/cache/assets/development/sprockets/922ebc4d88812a7efe8bba37ceca812b
	tmp/cache/assets/development/sprockets/9348c9319a7f6faad029d1746104c95f
	tmp/cache/assets/development/sprockets/980ebfac70ce03bf2a1cc8481c89e568
	tmp/cache/assets/development/sprockets/991dfbf66c48ddd2a35f2d167f33f5b7
	tmp/cache/assets/development/sprockets/994811b00ede0e61a11559f1d12f00b7
	tmp/cache/assets/development/sprockets/9ffe5ceb8561efa24b40cb22bcacb1ac
	tmp/cache/assets/development/sprockets/a6374daa039d522d100dcba1363631d8
	tmp/cache/assets/development/sprockets/a8015cc990728deea56e7a63509e69a4
	tmp/cache/assets/development/sprockets/aafe3da0a439899576b3860ce711c44d
	tmp/cache/assets/development/sprockets/ad15fd4a075393534fcf2753575f6f01
	tmp/cache/assets/development/sprockets/b00fb2c6a26e0eb40d0ba8b85a9e3a5b
	tmp/cache/assets/development/sprockets/b1b39c82a9be8120583b93f5fe4a45dd
	tmp/cache/assets/development/sprockets/b69968a264b35b8c16524028d1244bfc
	tmp/cache/assets/development/sprockets/b96cec3e1ba1ddd5607d0917dc18e6d8
	tmp/cache/assets/development/sprockets/ba84c143b50b75f6c8b11bcf5559be7d
	tmp/cache/assets/development/sprockets/bb95fa577c39a0e789aa7ab6dc00626f
	tmp/cache/assets/development/sprockets/c11a90e365fe746eea6fde3a64301540
	tmp/cache/assets/development/sprockets/c2818668fc272471441749741ff1ee25
	tmp/cache/assets/development/sprockets/c3ef9293fbea8063522234ccd37118a2
	tmp/cache/assets/development/sprockets/c70e3c7418a3889eb2fdeade11279bb4
	tmp/cache/assets/development/sprockets/c73be2cc5cc2de19d9d38ba15a9f4baa
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d0f02237ca9b5259fdc29db6b42d70f0
	tmp/cache/assets/development/sprockets/d3b90f970b89021b0a0a3965193e54bd
	tmp/cache/assets/development/sprockets/d638d3d3b32ff0918e3d87ccea6fc311
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/dd15182c3570296ce6ffe4218a9a2b8a
	tmp/cache/assets/development/sprockets/f68556b1c85af5fef568777db691978c
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/f80e2a168506065f5064908667470a3f
	tmp/cache/assets/development/sprockets/fba6e113515bc93068ead79fb2232773
	tmp/cache/assets/development/sprockets/ff1f65b475d3f677ba45ba8155f51674
	tmp/pids/server.pid
a
a
Minor fixes to index page
a
fdx
sort for categories and full width table
Changed search form, added sort (ascending only)
a
Merge branch 'Sid'

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

Conflicts:
	app/views/assignees/index.html.haml
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid