Initial commit
Merge branch 'master' of github.com:jayceelock/specialtrackerserver

Conflicts:
	.gitignore