firsr real commit of her gem
Merge branch 'master' of github.com:orlandocaraballo/her

Conflicts:
	README.md