Merge branch 'master' of https://github.com/codeparty/tracks into HEAD

Conflicts:
	.gitignore