Will The Singularity Make Humans More Machine-like?

:
Photo Courtesy of Wiki Creative Commons
We are on the verge of the exciting era when human intelligence and machines will converge in The Singularity.  This union will combine our biological components with non-biological devices as technology makes our intelligence trillions of times faster and stronger.  Do you think humans will become more machine-like with less human emotions, or will machines become more human-like with more emotions?  Or is there a common ground?
Gerald Everett Jones
La Puerta Productions
www.lapuerta.tv