Changed engine yard's image in sponsors section
Merge pull request #34 from magmaconf/Update_sponsors_section

Changed engine yard's image in sponsors section
Added margin top for getting from guadalajara to manzanillo's image on iphone and also added fixed width to getting from gudalajara to manzanillo's title
Merge branch '2014' of ssh://github.com/magmaconf/magmarails-com into 2014
Fixed footer's copyright aligment in spanish version
Merge pull request #35 from magmaconf/Fix_footer_copyright_aligment

Fixed footer's copyright aligment in spanish version
Updated Johnny Win's bio in speaker section
Merge pull request #36 from magmaconf/Update_speaker_bio

Updated Johnny Win's bio in speakers section
Changed Manuel Vidaurre's talk name and removed his name, only add name of conference
Merge pull request #37 from magmaconf/Update_schedule_section

Changed Manuel Vidaurre's talk name and removed his name, only add name ...
Modified Engine Yard logo margins
Merge branch '2014' into Update_sponsors_section
Merge pull request #38 from magmaconf/Update_sponsors_section

Modified Engine Yard logo margins
Fixed main menu on mobile
Fixed typos
Merge pull request #39 from magmaconf/Fix_main_menu_on_mobile

Fixed main menu on mobile
Merge pull request #40 from magmaconf/fix_typos

Fix typos
Removed talk name and added TBD instead of speaker name
Merge pull request #41 from magmaconf/Update_schedule_section

Update schedule
Mixins files in mixin folder