Merge branch '50_bootstrap_accordion' of https://github.com/smith11235/party_shuffle into staging
merging hopefullycorrectly
fixing merge errors
Merge branch 'staging'
fixed resolve issues