working on fixing the text in the navbar to the bottom of the navbar
Merge branch 'master' of github.com:team461WBI/website
Sidebar re styled
Merge branch 'master' of github.com:team461WBI/website
add todo stuff
'it looks really ugly'
Fix stupid bug
Merge branch 'master' of github.com:team461WBI/website
fix user toolbar stuffs
fix unclickable logo
Merge branch 'master' of github.com:team461WBI/website

Conflicts:
	app/assets/stylesheets/zbootstrap_and_overrides.css
oops
initial work on mass uploads -- not yet working

view at photos/mass
fix and move social buttons
Oops
Pretty social stuffz, pretty forum index, pretty other things also that I forgot to mention
Added a br

things
fix dropdowns (it was Chris's fault)
Merge branch 'master' of github.com:team461WBI/website
Change up the icons