Merging

Merging
Functional Requirement 5: Feed

Added viewing of a feed (using req.session.user_id)
TODO: Add multiple pages to feed
TODO: Verification of uploads, rollbacks on failure
TODO: Styling