Fixes bower.json conflict
Introduces minor tweaks to Who I want to Meet
Merge remote-tracking branch 'upstream/master' into ploveTrials
Merge pull request #4 from plove13x/ploveTrials

Plove trials