added iheartpy
Fixed merge conflicts