I forgot to commit this last time
resolved conflicts
added ssl, removed useless files
added bad request