transferred to group parse account, updated member backend to store conflicts as discrete 15 minute options
Merge branch 'master' of https://github.com/vickygx/theFrozzies