Fixed crash button bug
Loaded things into database
Fixed 1 conflict
Minor styling to party show page
Merge branch 'jbranch' into dev