who knows
Merge branch 'master' of https://github.com/amritamaz/google-hackathon-team7
Merge branch 'master' of https://github.com/amritamaz/google-hackathon-team7
Merge branch 'master' of https://github.com/amritamaz/google-hackathon-team7
working on sidebar
fixed merge conflicts