added a bash script
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
updated proginfo
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
aaaaaaa
aaaaaaa
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
aaaaaa
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