basics
updates
uhh
Merge branch 'master' into dashboard
more style updates
fixing something I fucked up
fixing stuff
Merge pull request #99 from zsherman/dashboard

Fixing stuff.