formatting and model ish and correcting my name
fixed conflicts
Merge branch 'master' of github.com:rwang-okta/clique
refresh db, loop dummy data, more fixing my name
Merge branch 'master' of github.com:rwang-okta/clique