oprava git ignore
Merge branch 'v2' of github.com:MartinFugess/Generator-nahledu-ttf-fontu into v2

Conflicts:
	.gitignore
Merge branch 'v2' of github.com:MartinFugess/Generator-nahledu-ttf-fontu

Conflicts:
	index.php