Merge pull request #170 from Cal-CS-61A-Staff/secure

forces https
Merge branch 'master' into hanging_fix