local commit
whatever
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git

Conflicts:
	CS496_Project_Persistence/derby.log