ui updates for shopping list
Merge branch 'master' of github.com:hirish/trolley

Conflicts:
	static/css/application.css
	static/css/application.scss
	static/index.html