Added ideas
Merge remote-tracking branch 'origin/master'

Conflicts:
	ideen.txt