Merge pull request #21 from notandrewkaye/develop

fix
Merge pull request #25 from notandrewkaye/develop

modal shittttt
Merge pull request #26 from notandrewkaye/develop

magda's changes, fuck github.. sometimes
Merge pull request #27 from notandrewkaye/develop

magda's changes, fuck github.. sometimesB
added id# & fixed margins in sidebar
added thinking style to sidebar