pagination complete
working on merging tweets and emails together into one stream
added uid attribute to email
minor changes to front end index page
fixed merge conflicts
changing so kaminari paginates array
changed merge
changed received to received_at for emails
made changes to factory name
Added methods to format tweet time and worked on front end formatting of tweets.
started platform model
fixing factory girl
all working
Formatted Emails to look the same as tweets(with minor differences)
merged in front_page_work branch
cleaned up platform index, made a model
cleaned up trailing whitespace
all passing
nothing changed
More front end work. Everything is paginated and displaying in one feed. Emails are expandable. Still need to fix email display time