Merge pull request #1 from cdude2k4/master

Update welcome.html
Adding spam to login.html
Update 1.1: Brought major changes to style
Update 1.1: Improved layout and expanded survey page.
Merge branch 'master' of github.com:newphew92/School
Updated the login page

-Changed the title
-Added a description
-Added customer support contact info
-Added a link to create a new account and temporary link to create a survey
Update of the create a new account page

-Changed the title
-Added a description
-Added a confirm password input
-Added a link to the login page
Merge pull request #4 from vwen2468/patch-3

Update of the create a new account page
Merge pull request #3 from vwen2468/patch-2

Updated the login page
Update 1.2 Fixed buttons and improved layout
Update account.html
Update login.html
New Change

Link change
Reset
Merge branch 'master' of github.com:newphew92/School
Test
Applying fix

Conflicts:
	account.html
	login.html
	survey.html
	surveyCreation.html
	surveyStyle.css
	welcome.html
Merge github.com:newphew92/School
Update 1.3: Possibly the final version for Ass4
Update 2.0 Final update for Ass4