woah underscore not in git yet
Merge branch 'input'
moved sidebar to it's own view
bug fixes