Working on displaying sites
Merge branch 'nirav2'

Conflicts:
	requirements.txt