Merge /home/g/work/otp

Conflicts:
	templates/index.html
Merge https://github.com/israellevin/otp
Back to default port after merging G's login.