Merge branch 'idea' into flipper

Conflicts:
	.gitignore
Merge branch 'gimp' into flipper

Conflicts:
	.gitignore