Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Used Theirs, doesn't matter, code block is in commented-out section.

1 files changed, 0 insertions, 3 deletions

diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
index 34533d6d..3c139c60 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
@@ -16,11 +16,8 @@ exports.FeedReader = Montage.create(Component, {
         value: function() {
             var self = this;
             var apiInit = function() {
-                console.log('google api initialized');
-
                 google.load("feeds", "1", {
                     callback: function() {
-                        console.log('google feeds api loaded');
                         self._apiLoaded = true;
                         self.feedURL = self._feedURL;
                         self.needsDraw = true;