Added Genius plugin.
fix merge conflicts
Merge branch 'sachinkesiraju-master'