Fiish user signup
merge conflicts
add ssl in production