pom bs
Merge branch 'master' of https://github.com/jgimbel/SEfall2013.git
adding my sql connector
trying to fix mysql driver
sql updates
changes from cidster
database connector working
removing old jar files
Merge remote-tracking branch 'origin/cidster'

Conflicts:
	SoftwareEngineering/target/classes/edu/ucollege/tech/Connections/MySQL.class
	SoftwareEngineering/target/classes/edu/ucollege/tech/ReadController.class
	SoftwareEngineering/target/m2e-wtp/web-resources/META-INF/maven/edu.ucollege/tech/pom.properties
commit
Merge branch 'master' of https://github.com/jgimbel/SEfall2013.git
doing a commit
fixes to person and mysql
cleaning bin
mysql connector commit
lots of changes, fixes to the database, and fixes to the controllers
mostly
Merge branch 'master' of https://github.com/jgimbel/SEfall2013

Conflicts:
	SoftwareEngineering/target/classes/edu/ucollege/tech/Connections/MySQL.class
	SoftwareEngineering/target/classes/edu/ucollege/tech/LogInController.class
	SoftwareEngineering/target/classes/edu/ucollege/tech/ReadController.class
adding teacher and student home pages
adding xml files
removing jquery javascript