Initial commit
remove tracking of generated files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore