3 commits

Author	SHA1	Message	Date
Rupika	74bd227da9	Resolved merge conflict	2019-01-10 22:22:15 -08:00
Rupika	4d4fd0f7c7	Created a new branch	2019-01-10 21:45:18 -08:00
kououken	79956e0186	Reimplemented front and back end SSL and made Docker copy in fresh files (database, html, etc.) every startup.	2018-12-22 17:57:39 -06:00