demo
Merge branch 'master' of https://github.com/oooooooo/abridgement

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/lists/index.html.erb