init commit
Merge branch 'master' of github.com:xamenrax/trackr

Conflicts:
	.gitignore