Added some stuff to index
Merge branch 'emilyBranch'
created a registration page, and a form validation file
blah
Merge branch 'Joseph'
moved stuff into folders
moved stuff into folders
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
recreated index.php
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
Merge branch 'master' of https://github.com/jbernie2/csc210final into Joseph

Conflicts:
	mysql command.txt
	mysql_command
	other/mysql command.txt
fixed the mysql update commands
fixed the mysql update commands