starts implementing panels
fixes merge conflict
edits sidebar links and top navbar
finishes implementing panels
changes decimal to integers in database
Merge branch 'master' of https://github.com/tyrbo/the_pivot
fixes failing tests
Schema file sucks