added code removed during merge. Refactored a little.
added show route for users
Merge pull request #197 from CalvinFernandez/fix-merged-deletions

added code removed during merge. Refactored a little.
added backend for user show and editing
merge
Merge remote-tracking branch 'upstream/master' into add-show-to-users
added backbone routing for users and updated user model and collection
added basic user view
tweaked routing spaci
added name field to create new user
fixed a css issue that was broken
Merge pull request #199 from CalvinFernandez/add-username-to-login-form

added name field to create new user
Load posts in order
added super basic ui wireframe
Merge pull request #201 from benrudolph/order-posts

Load posts in order
Merge pull request #202 from CalvinFernandez/add-show-to-users

Add show to users
added close event to company pill view and call it in the router
Randomly generate X amount of posts
Added usage comment
Merge pull request #203 from CalvinFernandez/ur-fix-header-bar

added close event to company pill view and call it in the router
Merge pull request #204 from benrudolph/gen-posts

(#193) - Randomly generate X amount of posts