Initial setup
Merge branch 'master' of github.com:wkanchan/tfa-server

Conflicts:
	.gitignore