Merge branch master of github.com:everydayhero/developer.everydayhero.com