Commit so I can pull
good stuff to commit?
Committing changes
Updates to home page and home.css to give us our login interface
Udated styles and html for all current pages
Initial commit of the teacher page
merge from master
committing changes due to merge
changes to the mysql stuff
Commiting changes from merge
Merge branch 'cidster' of https://github.com/jgimbel/SEfall2013 into cidster

Conflicts:

SoftwareEngineering/target/m2e-wtp/web-resources/META-INF/maven/edu.ucol
lege/tech/pom.properties
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