first commit!
Merge branch 'master' of github.com:jamesbee/AuthServer

Conflicts:
	.gitignore