change gitignore
Merge branch 'master' of github.com:vladislavsychev/tz

Conflicts:
	.gitignore