Hotfoot and basic generation
Ignores
Merge branch 'generation'

Conflicts:
	.gitignore