first commit
Merge branch 'master' of https://github.com/Callilol/tracker

Conflicts:
	.gitignore