kyle t
Merge branch 'master' of https://github.com/ISYS489/Team6

Conflicts:
	Website/accountsettings.php
	Website/accounttools.php
	Website/editaccountsettings.php
	Website/forgotpassword.php
	Website/forgotusername.php
	Website/index.php
	Website/login.php
	Website/register.php
	Website/search.php
	Website/searchresults.php
	Website/termsandconditions.php