Updated with latest version of react boilerplate