took out implements serializable from classes, took out remaining imports to junit.org, fixed up some tests to use jpgs already provided instead of having tot ake a photo
gson function in test
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
mege conflicts