changed some css
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop
fixed the fucking dashboard alignment
updated dashboard
in 48 minutes I will be intraveneously ingesting beer
fixed merge conflict
fixed merge conflict
legal copy
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop
Merge branch 'develop' of github.com:CH-JesseMa/karma_app