Merger ignore
Change .gitignore
Merge branch 'master' of github.com:LuciferUltraM/ticktee

Conflicts:
	.gitignore