commit before major pull
commit after pull
Merge pull request #27 from ambertunnell/ben_2

Ben 2
fixed clocks
fixed merge conflict re social links
working on article array
Merge branch 'master' into articlearray
fixed clock form
Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
still working on dashboard
Merge pull request #28 from ambertunnell/ben_2

Ben 2
tweets in initial dividers
Merge branch 'master' of github.com:ambertunnell/worldview
articles array working. news column now loads alternating bewteen columns. Not articles array is in order of tier response and then by date
Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
Merge branch 'articlearray'
working on footer and about
dashboard slightly better
dashboard slightly improved
Merge branch 'master' of github.com:ambertunnell/worldview