CODE YES
Merge remote-tracking branch 'upstream/master'

Conflicts:
	eddy.gemspec
Merge pull request #3 from jimmyqian/master

merge me