creating error message page
getting error controller set up correctly
error controller works correctly now, still need to make mapping correct
changes to errorcontroller
adding jquery files
creating first page
read page update
Revert "read page update"

This reverts commit 24d6b7372810503e3839f0b08362656c0f15dd52.
just an update
Revert "Revert "read page update""

This reverts commit f6059019f8f223e22c0e830b006564b63c8b5f61.
Merge remote-tracking branch 'origin/master' into MaManMatthew

Conflicts:
	SoftwareEngineering/target/m2e-wtp/web-resources/META-INF/maven/edu.ucollege/tech/pom.properties