commit before pull
fixed merge conflicts in index.html.erb
Merge branch 'master' of https://github.com/kiopelani/HELLO-WORLD into wesley-styling-index
fixed news height after delete button
default background image implemented
Merge pull request #45 from kiopelani/youngsun-adding-default-bimage

default background image implemented
entire delete button is link
Merge pull request #46 from kiopelani/kiope-youngsun_delete_widgets

entire delete button is link
fixed delete button
Merge pull request #47 from kiopelani/kiope-youngsun_delete_widgets

fixed delete button confirmed by youngsun
user can't add widget twice
Merge pull request #48 from kiopelani/kiope_youngsun-validation-for-widget-number

user can't add widget twice
Merge branch 'master' of https://github.com/kiopelani/HELLO-WORLD into wesley-styling-index
set widget boxes to more closly hold their contents
added dropdown menu sample
fixed music widget styling
widgets can be added by dropdown menu
Merge pull request #50 from kiopelani/kiope_add_widget_drop_down

Kiope widgets can be added by drop down menu
added side dropdown and cusom sized widgets
fixed merge conflicts