Merge branch 'master' of github.com:wvmitchell/SocialSmarts into changing_icons
Merge branch 'master' of github.com:wvmitchell/SocialSmarts into changing_icons
Merge branch 'master' of github.com:wvmitchell/SocialSmarts into changing_icons
in process: adjusting layout of smartbox elements
in process: updated smartbox layouts, fixed merge conflict
fixes error in _smartbox.html.erb
in process: cleaning up smartbox layouts
Merge branch 'master' of github.com:wvmitchell/SocialSmarts into adjusting_smartbox_layout
in process: cleaning up css
Merge branch 'master' of github.com:wvmitchell/SocialSmarts into adjusting_smartbox_layout
in process: tabs for nav cleaned up, working on tweeter details
Merge pull request #64 from wvmitchell/adjusting_smartbox_layout

Adjusting smartbox layout