working on parsing tweets
Merge branch 'master' into twitterwednesday
Merge pull request #10 from ambertunnell/ben_branch

Ben branch
cleans up files
Merge branch 'master' of github.com:ambertunnell/worldview
cleans up a bit more
solves merge conflict
twitter and twitter links working
twitter and twitter links worked and pulled
Merge pull request #11 from ambertunnell/ben_branch

Adds jquery ui, slidey down dealie for news headlines
Weather updates
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
tweaks
twitter li
pull after twitter working with li
Mild tweaks