Commit before merge
Resolves merge conflicts
Merges the update from mvc_temp
Comments out session destroy function call in users.php
Adds composer.json
Changes database credentials in model.php
Changes connection to pg_connect in model.php
Adds site title to template.html
Changes database connection to that of attached database in model.php
Adds SSL cert and key
Self-signs SSL certificate
Removes CSR file
Adds test code to find out values of ['HTTPS']
Modifies test code to find out values of ['HTTPS']
Adds code in index.php to adapt to Heroku's workflow
Attempts to resolve problem due to previous commit
Merge branch 'master' into mvc_temp
Modifies code for use on localhost after merging from master