changes datatype of data in tweets table
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
filter out fight schedule articles
Made ed color photo color
added unicron web server
Merge branch 'master' of github.com:ambertunnell/worldview
updates unicorn.rb
fixed photos, spacing on dash needs alignment, working on the effed up tweets
tweet dash initial draft working, buttons still working, changed tweet javascript file
Merge branch 'master' of github.com:ambertunnell/worldview
button text now persisting on first photo load
button text now persisting on more photos press
Merge branch 'master' of github.com:ambertunnell/worldview
button text now changing on photos when removed from dashboard
article button text now persisting
tweet buttons now persist upon refresh
updates README
Fixes merge conflicts