renamed packages, edited manifest to include StoryHoardApplication, getters and setters for story, chapter, choice in application class.
Merge branch 'master' into BuildingServer
server class to simplify using server
fixed merged conflicts with package names
deleted storyhoardapplication
merge confluct resolution
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard