Test commit
Merge branch 'master' of https://github.com/SchrodingersGat/ILI9340

Conflicts:
	Bitmap Generator/index.png
	ili9340.c