Merge branch 'wesley-index-styling'
Merge branch 'master' of https://github.com/kiopelani/HELLO-WORLD

Conflicts:
	hello-world/app/views/dashboard/index.html.erb
	hello-world/app/views/widgets/_newsitem.html.erb
fixed merge conflicts for pull
fit weather and alarm
fit sports widget
fit spotify widget
fit stocks app
Merge pull request #34 from kiopelani/kiope-add_widgets_link

Kiope added add widgets link
commit before pull
Merge branch 'master' of https://github.com/kiopelani/HELLO-WORLD into wesley-styling-index
Merge pull request #35 from kiopelani/kiope-add_widgets_link

fixed log in/log out view display
Merge branch 'master' of https://github.com/kiopelani/HELLO-WORLD into wesley-styling-index
Merge pull request #36 from kiopelani/wesley-styling-index

Wesley styling index
user with no widgets is prompted to add widget
added weather, new, spotify, and alarm to add widgets list
added more widgets to add widget link