add by Calv
Merge branch 'master' of git://github.com/ga-hk-ror-eddie-201305/hello-world-eddie