Redesigned main section
Merge branch '2014' of ssh://github.com/magmaconf/magmarails-com into 2014