always rendering image at end of tweet
article refac working. now adding queries
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' into articlerefac
still working on best queries
have advanced article cascading
cleaned up articles js
Merge branch 'master' of github.com:ambertunnell/worldview
Merged with master
fixed accidental deletion of var set from articlerefac
updated js & controller to reciever userCity id
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' into twitrefrac
Have geoloc properly formatted for articles
tweet controller is sending hashob of city tweets and biggerthing tweets
twitter display refac into print function. tweet cascading fall back working
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'twitrefrac'
fixed tweet saved in dash board detection- bug was missing space is jquery selector
Merge branch 'master' of github.com:ambertunnell/worldview