'php' text added to show the questions in GSUSurveryViewSurvey php file
X
Merge branch 'master' of https://github.com/cb05757/Distributed_Web_Survey

Conflicts:
	Database/table_creation.sql
	Website/GSUSurvey.css
	Website/GSUSurveyViewSurvey.php
	Website/error.php
	Website/includes/config.php
	Website/includes/db-connect.php
	Website/includes/functions.php
	Website/includes/logout.php
	Website/includes/process_login.php
	Website/includes/register.inc.php
	Website/index.php
	Website/js/forms.js
	Website/js/sha512.js
	Website/protected_page.php
	Website/pulldb.php
	Website/register.php
	Website/register_success.php