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
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
added side dropdown and cusom sized widgets
fixed merge conflicts
Merge pull request #51 from kiopelani/wesley-styling-index

Wesley styling index