Merge branch 'master' of C:\Users\Chris\AndroidStudioProjects\DogSweater with conflicts.
Completed Project Saving and Loading from the Database