minor tweaks
changes
Merge pull request #5 from ambertunnell/ben_branch

Ben branch
commit so I can pull
adds login button
Adjusted the clocks
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Uncomment out actions in users controller