From f8edad6f0f233ab19200b15e2034e9890bd38365 Mon Sep 17 00:00:00 2001
From: Jason Walsh <jason@walsh-web.com>
Date: Sat, 4 Jun 2016 19:29:05 -0700
Subject: [PATCH] Initial Commit For Building Master, Also Fix Trailing Missing
 Trailing Comma Which Was Causing Failing Build Step

---
 lib/creators/GoogleMapHolder.js | 3 ++-
 src/creators/MarkerCreator.js   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/creators/GoogleMapHolder.js b/lib/creators/GoogleMapHolder.js
index 3dac5af..cadf788 100644
--- a/lib/creators/GoogleMapHolder.js
+++ b/lib/creators/GoogleMapHolder.js
@@ -56,7 +56,8 @@ var mapControlledPropTypes = {
   options: _react.PropTypes.object,
   streetView: _react.PropTypes.any,
   tilt: _react.PropTypes.number,
-  zoom: _react.PropTypes.number
+  zoom: _react.PropTypes.number,
+  styles: _react.PropTypes.array
 };
 
 exports.mapControlledPropTypes = mapControlledPropTypes;
diff --git a/src/creators/MarkerCreator.js b/src/creators/MarkerCreator.js
index 3acfb05..1b84f3b 100644
--- a/src/creators/MarkerCreator.js
+++ b/src/creators/MarkerCreator.js
@@ -36,7 +36,7 @@ export const markerControlledPropTypes = {
   title: PropTypes.string,
   visible: PropTypes.bool,
   zIndex: PropTypes.number,
-  shouldMarkerUpdate: PropTypes.func
+  shouldMarkerUpdate: PropTypes.func,
 };
 
 export const markerDefaultPropTypes = defaultPropsCreator(markerControlledPropTypes);