api fix
Merge branch 'master' of https://github.com/michaelrbock/CheetSheet

Conflicts:
	templates/signup.html