user view shows correctly formatted data
Merge Langer and Schulman's changes

Merge branch 'master' of https://github.com/matthewdschulman/PennApps2014