The framework for the database. It isn't actually used by the rest of the program yet
Committing so I can pull apparently?
Merge branch 'master' of https://github.com/sugarria/Dungeon-Secretary

Conflicts:
	DungeonSecretary/bin/DungeonSecretary.apk
	DungeonSecretary/bin/classes.dex
	DungeonSecretary/bin/dexedLibs/android-support-v4-032990f3f985de3ebf4d8c001f3f080e.jar
	DungeonSecretary/bin/dexedLibs/google-play-services_lib-8cfe14d3420726ee54a764cdb0c7ef56.jar
	DungeonSecretary/bin/resources.ap_
	DungeonSecretary/project.properties