Merge github.com:magmaconf/magmarails-com into Add_media_sponsors
Merge pull request #53 from magmaconf/Update_schedule_section

Update schedule section
Merge branch 'Add_media_sponsors' of github.com:magmaconf/magmarails-com into Add_media_sponsors
Merge branch '2014' into Add_media_sponsors
Added Code Climate logo to media sponsors
Merge pull request #54 from magmaconf/Add_media_sponsors

Add Code Climate to media sponsors
Changed Emmanuel Delgado talk to TBD