Merge branch 'master' of github.com:wvmitchell/SocialSmarts into changing_icons

Conflicts:
	app/views/dashboard/_smartbox.html.erb
Merge branch 'master' of github.com:wvmitchell/SocialSmarts into changing_icons
Merge branch 'master' of github.com:wvmitchell/SocialSmarts into changing_icons
made layout adjustments to logged in user info in user badge
Merge pull request #55 from wvmitchell/changing_icons

Changing icons