changes made on server
Merge remote-tracking branch 'origin/master'

Conflicts:
	myweatherapp/static/lens.png
	settings.py