Add ability to customize formats

Signed-off-by: Jason Chen <jhchen7@gmail.com>
Signed-off-by: byronm <byronm@cs.stanford.edu>
conflict resolution
Merge branch 'jhchen/formats'
Conflict resolution.