started on widget styles
in process of adding sidebar
commit before pulls
pulled master
added gridster
added basic widgets controller
Merge pull request #29 from kiopelani/kiope-widgets-controller

added basic widgets controller
basic drag and drop with divs
no more news
Finished adding all background images
Merge pull request #30 from kiopelani/youngsun-weather-news

no more news
we can move divs
Merge branch 'wesley-index-styling'
resolved merge conflicts
resolved merge conflicts
resolved newsitem merge conflicts
Merge pull request #33 from kiopelani/wesley-index-styling

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