target path change
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git
Stuff
ok
asdf
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git

Conflicts:
	CS496_Project_Persistence/derby.log
	CS496_Project_Persistence/test.db/db.lck
	CS496_Project_Persistence/test.db/log/log.ctrl
	CS496_Project_Persistence/test.db/log/log1.dat
	CS496_Project_Persistence/test.db/log/logmirror.ctrl
	CS496_Project_Persistence/test.db/seg0/c490.dat
	CS496_Project_Persistence/test.db/seg0/c4a1.dat
	CS496_Project_Persistence/test.db/seg0/c4b1.dat
	CS496_Project_Persistence/test.db/seg0/c4f0.dat
	CS496_Project_Persistence/test.db/seg0/c501.dat
	CS496_Project_Persistence/test.db/seg0/c60.dat
	CS496_Project_Persistence/test.db/seg0/c81.dat
	CS496_Project_Persistence/test.db/seg0/c90.dat
	CS496_Project_Webservice/derby.log
Fixed derby error