Adjusted the clocks
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Uncomment out actions in users controller
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Fixes weather (thanks Amber)
Merge pull request #6 from ambertunnell/ben_branch

Ben branch