123
Merge branch 'master' of https://github.com/iitwebdev/L-and-L

Conflicts:
	MyProject1/myproject1/templates/description.jinja2
	MyProject1/myproject1/views.py
Merge branch 'master' of https://github.com/iitwebdev/L-and-L