version of lab14 using Derby
Merge branch 'gh-pages' of github.com:ycpcs/cs496-spring2014 into gh-pages

Conflicts:
	index.md