Added sidebar
Merge branch 'master' of github.com:TomTom101/MacRefurbishedShop

Conflicts:
	config/application.coffee
Merge branch 'master' of github.com:TomTom101/MacRefurbishedShop
index on master: 689ebec Merge branch 'master' of github.com:TomTom101/MacRefurbishedShop
On master: localStorage
trying …