clocks working in other file
Merge branch 'master' of github.com:ambertunnell/worldview
js clocks functional and clickable
clocks working and working through js for new cities
clocks functional and pulled resolved merge conflicts
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
changed click clock class
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
now buttons disappear if not logged in
Merge branch 'master' of github.com:ambertunnell/worldview
clocks resized working on spacing
Merge branch 'master' of github.com:ambertunnell/worldview
Fix merge conflicts