updated web link and icon for reactconf
Merge remote-tracking branch 'upstream/master' into events
Merge pull request #157 from andy1138/events

Updated React'14 with new website and logo