Initial commit
Merge branch 'master' of https://github.com/markstephens/slimTrack

Conflicts:
	.gitignore