I guess
Merge branch 'master' of https://github.com/mcuringa/nyc-el

Conflicts:
	el/db.sqlite3