changes in .gitignore
minor change
more things to display
clean
Merge branch 'devel'

Conflicts:
	.gitignore
	interfaces/kindle/screen.py