trys
katy chagnes?
Merge branch 'master' of https://github.com/mcuringa/nyc-el

Conflicts:
	el/el/models.py
	el/el/templates/home.html
	el/el/views.py
dunno
Merge branch 'master' of https://github.com/mcuringa/nyc-el