Updated README
Merge pull request #16 from erahm/user

Updated README
README changes
README changes
README Changes
trying to fix numbering in README
Merge branch 'master' of github.com:erahm/fatbard
I... don't even know
skipping a test for now
Merge pull request #17 from erahm/user

User
Added Campaign and CampaignManager
Merge pull request #18 from erahm/campaign

Added Campaign and CampaignManager
Added Campaign, Character, JournalEntry
Merge branch 'campaign'
Wrote JournalEntryController methods and added routes
Merge pull request #19 from erahm/journal

Wrote JournalEntryController methods and added routes
Added retrieveJournal method to CampaignController
Merge branch 'journal'
Only delete Journal Entry if it is not null
Merge pull request #20 from erahm/journal

Only delete Journal Entry if it is not null