Prep to merge with Marisol's CSS fix
Merge branch 'master' of https://github.com/jchang-bcp/eros

Merge in CSS fixes
Merge branch 'master' of https://github.com/jchang-bcp/eros

Merge in more of Marisol's fixes
Merge branch 'master' of https://github.com/jchang-bcp/eros

Marisol is playing with the CSS
Merge branch 'master' of https://github.com/jchang-bcp/eros

Hi!
Merge branch 'master' of https://github.com/jchang-bcp/eros

Marisol is upset
Merge branch 'master' of https://github.com/jchang-bcp/eros

Uggghhhhhhh
Merge branch 'master' of https://github.com/jchang-bcp/eros

Marisol i swear
Merge branch 'master' of https://github.com/jchang-bcp/eros

Okay
Added support for sorting by subject