sidebar
Merge branch 'master' of https://github.com/cranberryofdoom/wislr

Conflicts:
	app/assets/stylesheets/sidebar.css.scss