Merge
Merge branch 'master' of github.com:IranOnRails/IrRubyConf2015
Some clean up for another layout