Integrando
Merge remote-tracking branch 'remotes/origin/mergingIssue1'

Conflicts:
	app/urls.py
	app/views.py