Created by: btnwtn
@fson Ran into major problems with git trying to merge this pull-request: https://github.com/facebookincubator/create-react-app/pull/363
Created by: btnwtn
@fson Ran into major problems with git trying to merge this pull-request: https://github.com/facebookincubator/create-react-app/pull/363