flat iron fail, hacker news copy fail...trying to get bootstrap
added bootstrap, implemented rough inbox view
small changes
expand and contract inbox messages mostly implemented...minor adjustments needed
fixed login css merge conflict
Twitter Home feed is now pulled into the home page
merged in css branch
hide-expand content works
Merged CSS branch and added actual twitter feed to view
Merge branch 'wire_frame_views' of github.com:Diasporism/feed_engine into twitter_api
deleted unnecessary view
jquery playing
Merge branch 'twitter_api' of github.com:Diasporism/feed_engine into wire_frame_views
twitter authentication not working
switched out google client id when authenticating with google
google login now working
changed data scope for google api to access email
Splash page template added plus some other stuff that I forgot was in this commit
simple views in place, working on vcr test for twitter feed
changes