Story 47112795: committing tested changes
Story 47112795: actually fixing bugs
fixing tree mustache file
fixing syntax error
Story 45754019: fixing name/email display
sorting by last name
Story 47112795: committing stashed changes
Story 47112795: replacing deleted lines
Story 45754019: uncommitted change, adding parentheses around emails
Merge remote-tracking branch 'github/dev-brendan'