Minor update
Merge remote-tracking branch 'origin/master'

Conflicts:
	first_try.py
	generate_database_display.py