commit
Merge branch 'master' of https://github.com/qazix/cs313
inClass signIn jsp and servlets
Merge branch 'master' of https://github.com/qazix/cs313

Conflicts:
	assignments/phphelper/survey.php