sidebar stuff
dsjfio
merge conflix
stuff
Merge branch 'master' of https://github.com/amritamaz/google-hackathon-team7
navbar looks great
ugh
mybuckets